mod:反馈问题修复

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HomeController.cs

@@ -2,6 +2,7 @@
 using CallCenter.Utility;
 using CallCenterApi.Interface.Controllers.Base;
 using CallCenterAPI.WechatSDK;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -9,6 +10,7 @@ using System.Data.SqlTypes;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
+using System.Web.Script.Serialization;
 
 namespace CallCenterApi.Interface.Controllers
 {
@@ -251,5 +253,76 @@ namespace CallCenterApi.Interface.Controllers
         }
 
 
+        public string  Testjson()
+        {
+            string jsonstr = "";
+            List<Material> matmodels = new List<Material>();
+            matmodels.Add(new Material { materialcode = "001", materialname = "物料名称", formula = "正常", returnum = 5 });
+            matmodels.Add(new Material { materialcode = "002", materialname = "物料名称2", formula = "正常2", returnum = 50 });
+            matmodels.Add(new Material { materialcode = "003", materialname = "物料名称3", formula = "正常3", returnum = 500 });
+            return matmodels.ToJson();
+
+
+        }
+
+        public ActionResult TestjsonToObj(string jsonstr)
+        {
+            JavaScriptSerializer Serializer = new JavaScriptSerializer();   //实例化⼀个能够序列化数据的类
+            List<Material> list = Serializer.Deserialize<List<Material>>(jsonstr);
+
+            if (list != null && list.Count>0)
+            {
+                foreach (var item in list)
+                {
+
+
+                }
+            }
+           
+            return Success("成功");
+        }
+
+        public class Material
+        {
+            /// <summary>
+            /// 物料编号
+            /// </summary>
+            public string materialcode { get; set; }
+
+            /// <summary>
+            /// 产品名称
+            /// </summary>
+            public string materialname { get; set; }
+
+            /// <summary>
+            /// 规格
+            /// </summary>
+            public string formula { get; set; }
+
+            /// <summary>
+            /// 返厂数量
+            /// </summary>
+            public int returnum { get; set; }
+        }
+
+        public class copymessage
+        {
+            public string deptid { get; set; }
+            public List<string> ucodelist { get; set; }
+        }
+
+        public string copyson()
+        {
+            string jsonstr = "";
+            List<copymessage> matmodels = new List<copymessage>();
+
+            matmodels.Add(new copymessage { deptid = "001", ucodelist = new List<string> { "8001", "8002", "8003" } });
+            matmodels.Add(new copymessage { deptid = "002", ucodelist =new List<string> { "8001", "8002", "8003" } });
+
+            return matmodels.ToJson();
+
+
+        }
+
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -800,26 +800,20 @@ namespace CallCenterApi.Interface.Controllers.knowledge
 
 
         /// <summary>
-        /// 上传视频
+        /// 上传附件
         /// </summary>
         /// <returns></returns>
         //  [Authority]
-        public ActionResult UpLoadVideo(string type, HttpPostedFileBase file)
+        public ActionResult UpLoadProcessApp(string type, int size, HttpPostedFileBase file)
         {
             try
             {
                 if (file == null) return Error("参数传入失败");
                 if (Request.Files.Count == 0) return Error("保存失败");
-                //   string userCode = CurrentUser.UserData.F_UserCode;
-                Stream stream = file.InputStream;    //将文件转为流 
-                int size = file.ContentLength / 1024;
-                if (size > 102400)
-                {
-                   return  Error("视频大于100M,请重新选择");
-                }
-                string filePathName = string.Empty;
+                string stropenid = HttpUtility.UrlDecode(RequestString.GetFormString("openid"));
                 #region 保存文件到本地路径
-                string path = "/Upload/Video/" + DateTime.Now.ToString("yyyy/MM/dd") + "/";
+                string path = "/Upload/APP/" + DateTime.Now.ToString("yyyy") + "/" + DateTime.Now.ToString("MM") + "/" + DateTime.Now.ToString("dd") + "/";
+                string filePathName = string.Empty;            
                 string localPath = Server.MapPath(Path.Combine(HttpRuntime.AppDomainAppPath, path));
                 string ex = Path.GetExtension(file.FileName);
                 string oriname = Path.GetFileNameWithoutExtension(file.FileName);
@@ -860,7 +854,7 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                         model_T_Sys_Accessories.F_AddTime = DateTime.Now;//上传时间
                         model_T_Sys_Accessories.F_FileName = filePathName;//附件名称
                         model_T_Sys_Accessories.F_FileType = type;//附件类型
-                        model_T_Sys_Accessories.F_FileUrl = (filePathName).Replace('\\', '/');//附件地址
+                        model_T_Sys_Accessories.F_FileUrl = (path+filePathName).Replace('\\', '/');//附件地址
                         model_T_Sys_Accessories.F_Size = size;
                         //     model_T_Sys_Accessories.F_UserCode = userCode;//上传人  
                         model_T_Sys_Accessories.F_OriName = oriname;
@@ -877,6 +871,8 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     }
                     else
                         return Error("文件上传失败，请重新上传，失败原因：" + uploadBeforres);
+                    #region 添加日志 本地测试
+                    #endregion
                 }
                 else
                     return Error("格式修改出错，请重新上传");

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -1073,15 +1073,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     sql += " and (F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + ")";
                               
                                     sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + "))";                               
-                                    sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
+                                    sql += "  and (T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                                     if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                                     {
-                                      sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + "))";                
+                                      sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";                
+                                    }
+                                    else
+                                    {
+                                        sql += $")";
                                     }
-                                    //else
-                                    //{
-                                    //    sql += $")";
-                                    //}
                                 }
                                 else
                                 {
@@ -1541,7 +1541,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                     {
-                        string markdepts = "37,57,74,88,268,422,339";
+                        string markdepts = "37,57,74,88,268,422,339,213";
                         string qualdepts = "12,36,295,245";
                         string detpid = "" + ua.F_DeptId;
                         var deparmentlist = new List<Model.T_Sys_Department>();
@@ -1898,15 +1898,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             //{
                             sql += " or F_State2 in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.revoke + "))";
                             //}
-                            sql += "  and T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
+                            sql += "  and (T_Wo_WorkOrder.F_ID in ( " + dealstr + ") ";
                             if (!string.IsNullOrEmpty(GetRevokeWo(ua.F_UserCode)))
                             {
-                                sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + "))";
+                                sql += " or ((F_State=" + (int)EnumWorkOrderState.assign + " or F_State2=" + (int)EnumWorkOrderState.assign + ") and T_Wo_WorkOrder.F_ID in (" + GetRevokeWo(ua.F_UserCode) + ")))";
+                            }
+                            else
+                            {
+                                sql += $")";
                             }
-                            //else
-                            //{
-                            //    sql += $")";
-                            //}
 
                         }
                         else
@@ -2089,7 +2089,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG" || ro.F_RoleCode == "GC")
                         {
 
-                            string markdepts = "37,57,74,88,268,422,339";
+                            string markdepts = "37,57,74,88,268,422,339,213";
                             string qualdepts = "12,36,295,245";
                             string detpid = "" + ua.F_DeptId;
                             var deparmentlist = new List<Model.T_Sys_Department>();
@@ -2257,7 +2257,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             string touser = "";
                             string strwhere = "";
                             string contens = "";
-                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422) order by F_CreateTime desc)";
+                            strwhere = $" F_DeptId in (select top 1 F_NextDept  from T_Wo_WorkOrderItem_New where F_WoID={model.F_ID} and F_NextDept in(37,57,74,88,268,295,339,422,213) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
@@ -2828,7 +2828,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(OpenId))
             {
                 int woflag = 0;
-                string markdepts = "37,57,74,88,268,295,339";
+                string markdepts = "37,57,74,88,268,295,339,213";
                 string sqlstr = "";
                 if (id <= 0)
                 {
@@ -2918,16 +2918,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     list.Add(model);
                 }
                 var itemlasts = itembll.GetModelList("  F_WoID=" + id + " ");
-                //; var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
-                //if (!string.IsNullOrEmpty(model.F_Files))
-                //{
-                //    FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
-                //}
+                 var configfj = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
                 if (!string.IsNullOrEmpty(model.F_Files))
                 {
-                    var configfj = "http://192.168.8.9:1005/Upload/APP/2022/06/22/";
-                    FileUrl = GetFileData(model.F_Files, configfj);
+                    FileUrl = GetFileData(model.F_Files, configfj.F_ParamValue);
                 }
+                //if (!string.IsNullOrEmpty(model.F_Files))
+                //{
+                //    var configfj = "http://192.168.8.9:1005/Upload/APP/2022/06/22/";
+                //    FileUrl = GetFileData(model.F_Files, configfj);
+                //}
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
                 if (model.F_Source != "3")
                 {
@@ -2975,7 +2975,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             int? flag = 0;
 
-            string markdepts = "37,57,74,88,268,295,339";
+            string markdepts = "37,57,74,88,268,295,339,213";
             if (!string.IsNullOrEmpty(usercode))
             {
                 Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(usercode);
@@ -2997,9 +2997,19 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         else
                         {
-                            var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_OptType=1  and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                            var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
                             if (itemnext != null)
                                 flag = itemnext.F_Type;
+                            if (flag != 1 || flag != 2)
+                            {
+                                var itemnext2 = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + "  and F_IsUsed=0 and  F_WoID='" + fid + "' and F_CreateUser='" + ua.F_UserCode + "' order by F_ID desc");
+                                if (itemnext2 != null)
+                                    foreach (var item in itemnext2)
+                                    {
+                                        if(item.F_WoState!=10)
+                                        flag = item.F_Type;
+                                    }
+                            }
                         }
                     }
                 }
@@ -4944,7 +4954,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(input.F_ZL_ClaimAmount))
                 model.F_ZL_ClaimAmount = input.F_ZL_ClaimAmount;//质量管理科-索赔金额（单位元，对应责任单位）
             if (!string.IsNullOrEmpty(input.F_ZL_ResponsibleUnit))
-                model.F_ZL_ResponsibleUnit = string.IsNullOrEmpty(model.F_ZL_ResponsibleUnit) ? input.F_ZL_ResponsibleUnit : model.F_ZL_ResponsibleUnit + "；" + input.F_ZL_ResponsibleUnit;//质量管理科-责任单位（需列出，可选多个）
+                model.F_ZL_ResponsibleUnit = input.F_ZL_ResponsibleUnit;//质量管理科-责任单位（需列出，可选多个）
             if (!string.IsNullOrEmpty(input.F_ZL_ApprovalOpinions))
                 model.F_ZL_ApprovalOpinions = input.F_ZL_ApprovalOpinions;// 质量管理科-审批意见（同意、不同意，若选择不同意，增加输入框输入补充内容）
             if (!string.IsNullOrEmpty(input.F_ZL_ApprovalDisagree))
@@ -4958,7 +4968,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(input.F_ZL_Fquantity))
                 model.F_ZL_Fquantity = input.F_ZL_Fquantity;// 质量管理科-确认实收数量（吨）
             if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements))
-                model.F_ZL_ImprovementRequirements = string.IsNullOrEmpty(model.F_ZL_ImprovementRequirements) ? input.F_ZL_ImprovementRequirements : model.F_ZL_ImprovementRequirements + "；" + input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
+                model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
             if (!string.IsNullOrEmpty(input.F_ZL_CApprovalNo))
                 model.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
             if (!string.IsNullOrEmpty(input.F_ZL_CJ_IsRecord))
@@ -4984,8 +4994,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_UnLoadingFee = input.F_UnLoadingFee;
             if (input.F_MaterialFee > 0) //返料费
                 model.F_MaterialFee = input.F_MaterialFee;
-            //if (!string.IsNullOrEmpty(input.F_EventReason))
-            //    model.F_EventReason = input.F_EventReason;//质量管理科-事件原因
+            if (!string.IsNullOrEmpty(input.F_EventReason))
+                model.F_EventReason = input.F_EventReason;//质量管理科-事件原因
             if (!string.IsNullOrEmpty(input.F_DrivePhone))
                 model.F_DrivePhone = input.F_DrivePhone;//电话号码
             if (!string.IsNullOrEmpty(input.F_WorkmanShip))
@@ -4994,6 +5004,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 model.F_Manufacturers = input.F_Manufacturers;//质量管理科-原料及厂家
             if (input.F_ProductionNum > 0)
                 model.F_ProductionNum = input.F_ProductionNum;//质量管理科-该批次生产数量
+            if (!string.IsNullOrEmpty(input.F_TS_Level))
+                model.F_TS_Level = input.F_TS_Level;//投诉-重要级别：轻微、一般、较大、重大
 
             return model;
         }
@@ -5022,23 +5034,31 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     return Error("工单已转派请勿重复操作！");
                 }
-                if (model .F_State !=0)
+                if (model.F_State != 0)
                 {
                     //string strsql = " and F_Type in(3,"+ua.F_Flag+")";
-                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%') and F_IsUsed=0 order by   F_ID desc ").FirstOrDefault();
-                    if (modellist == null)
+                    var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%') and F_IsUsed=0 order by   F_ID desc ");
+                    if (modellist.Count<=0)
                     {
                         //if (modellist.F_NextUser != ua.F_UserCode)
                         return Error("非接单人不可操作工单");
                     }
+                    if (modellist.Count > 1 && model.F_Flag == 9)
+                    {
+                        foreach (var item in modellist)
+                        {
+                            if (item.F_WoState != 2)
+                                return Error("操作失败！");
+                        }
+                    }
                 }
-               if (sms ==-1)
+                if (sms ==-1)
                 {
                     var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
                      sms = (int)itemlast.F_IsSMS;
                 }
                 WorkOrderNewInput input = new WorkOrderNewInput();
-                string markdepts = "37,57,74,88,268,422,339";
+                string markdepts = "37,57,74,88,268,422,339,213";
                 string qualdepts = "12,36,295,245";
                 if (ua != null)
                 {
@@ -5825,9 +5845,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             return Error("非接单人不可操作工单");
 
                         }
-                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_IsUsed=1 and F_WoState=1 and F_NextUser like '%" + ua.F_UserCode + "%'  order by  F_ID desc ").FirstOrDefault();
-                        if (modellast != null && modellast.F_ID > modellist.F_ID)
-                            return Error("工单已接单无需重新接单");
+                        var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_WoState=1 and F_NextUser like '%" + ua.F_UserCode + "%'  order by  F_ID desc ");
+                        if (modellast.Count > 0)
+                        {
+                            int isused = modellast.Select(p => p.F_IsUsed == 0).Count();
+                            if (isused <= 0)
+                                return Error("工单已接单无需重新接单");
+                        }
                         int? zflag = modellist.F_Type;
                         var res = SureWO(ua, model, Convert.ToInt32(zflag));
                         if (res)
@@ -5984,7 +6008,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
          string uncont = "",
         int isvisit = 1, int isover = 0)
         {
-            string markdepts = "37,57,74,88,268,422,339";
+            string markdepts = "37,57,74,88,268,422,339,213";
             string qualdepts = "12,36,295,245";
             if (!string.IsNullOrEmpty(OpenId))
             {
@@ -6019,12 +6043,20 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 //if (modellist.F_NextUser != ua.F_UserCode)
                                 return Error("非接单人不可操作工单");
                             }
+                            if (model.F_Flag == 9)
+                            {
+                                return Error("操作失败！");
+                            }
                             if (markdepts.Contains(ua.F_DeptId.ToString()) || qualdepts.Contains(ua.F_DeptId.ToString()))
                             {
                                 input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
-                                //input.F_EventReason = deptment.EventReason;// 事件原因
+                                input.F_EventReason = deptment.EventReason;// 事件原因
                                 input.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;// 改进要求
                                 input.F_IsVisit = isvisit.ToString();
+                                input.F_WorkmanShip = deptment.WorkmanShip;//质量管理科-工艺
+                                input.F_Manufacturers = deptment.Manufacturers;//质量管理科-原料及厂家
+                                input.F_ProductionNum = deptment.ProductionNum;//质量管理科-该批次生产数量
+                                input.F_TS_Level = deptment.TS_Level;//投诉-重要级别：轻微、一般、较大、重大
 
                             }
                             
@@ -6033,7 +6065,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("工单已处理请勿重复操作！");
                             else
                             {
-                                var res = DealWO(ua, model, F_Files, input, cont, isover, uncont, Convert.ToInt32(modellist.F_Type), deptment.EventReason);
+                                var res = DealWO(ua, model, F_Files, input, cont, isover, uncont, Convert.ToInt32(modellist.F_Type));
                                 if (res)
                                     return Success("处理成功");
                                 else
@@ -6159,22 +6191,30 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     //验证信息
                     if (model != null)
                     {
-                        //string strsql = "";
-                        //if (ua.F_Flag == 1)
-                        //{
-                        //    strsql = $" and F_Type in(1,3)";
-                        //}
-                        //else if (ua.F_Flag == 2)
-                        //{
-                        //    strsql = $" and F_Type in(2,3)";
-                        //}
+                        int flag = 0;
+                        string markdepts = "37,57,74,88,268,422,339,213";
                         var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and (F_CreateUser={ua.F_UserCode} or F_NextUser like '%{ua.F_UserCode}%')  order by   F_ID desc ").FirstOrDefault();
 
                         if (modellist == null)
                         {
                             return Error("非接单人不可操作工单");
                         }
-                        var res = BackWO(ua, model, cont, type, (Convert.ToInt32(modellist.F_Type)));
+
+                        if (!string.IsNullOrEmpty(modellist.F_CreateUser))
+                        {
+                            var deptid = userAccountBLL.GetModel(modellist.F_CreateUser.ToString())?.F_DeptId;
+                            if (markdepts.Contains(deptid.ToString()))
+                            {
+                                var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =1 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + modellist.F_CreateUser + "%' order by F_ID desc").FirstOrDefault();
+                                if (itemnext.F_Flag == 9)
+                                {
+                                    model.F_Flag = 9;
+                                }
+
+                            }
+                        }
+                        flag = Convert.ToInt32(Convert.ToInt32(modellist.F_Type));
+                        var res = BackWO(ua, model, cont, type, flag);
                         if (res)
                             return Success("退回成功");
                         else
@@ -6208,31 +6248,49 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
+                        string markdepts = "37,57,74,88,268,422,339,213";
                         Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_OptType =1 and F_IsUsed=0 and F_CreateUser={ua.F_UserCode} order by   F_ID desc ").FirstOrDefault();
+                        var modelnext = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_OptType=1  and F_CreateUser={ua.F_UserCode} order by   F_ID desc ");
 
-                        if (modellist != null)
+                        if (modelnext != null)
                         {
-                            //string createuser = modellist.F_CreateUser;
-                            //if (!string.IsNullOrEmpty(createuser))
-                            //{
-                            //    if (createuser != ua.F_UserCode)
-                            //        return Error("无操作权限");
-                            //}
-                            //if (modellist.F_WoState == (int)EnumWorkOrderState.assign)
-                            //{
+                            foreach (var item in modelnext)
+                            {
+                                if (item.F_IsUsed == 1)
+                                    return Error("撤回失败,无法撤回！");
+                            }
+                            var modellist = itembll.GetModelList($"F_WoID={model.F_ID} and F_OptType=1 and F_IsUsed=0 and F_CreateUser={ua.F_UserCode} order by   F_ID desc ");
+                            if (modellist == null)
+                            { return Error("无操作权限"); }
                             if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
                             {
                                 flag = 3;
                             }
+                            else if (modellist != null && modellist.Count > 0)
+                            {
+                                if (markdepts.Contains(ua.F_DeptId.ToString()))
+                                {
+                                    var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =1 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                                    if (modellist.Count == 2)
+                                    {
+                                        flag = 3;
+                                        model.F_Flag = 9;
+                                    }
+                                    else if (itemnext.F_Flag == 9)
+                                    {
+                                        flag = 3;
+                                        model.F_Flag = 9;
+                                    }
+                                }
+                                flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                            }
                             else
                             {
-                                flag = Convert.ToInt32(modellist.F_Type);
+                                return Error("无操作权限");
                             }
                             var res = RevWO(ua, model, cont, flag);
                             if (res)
                                 return Success("撤回成功");
-                            else return Error("撤回失败！");
                             //}
                             //else
                             //    return Error("撤回失败！");
@@ -6464,7 +6522,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,422,339";
+            string markdepts = "37,57,74,88,268,422,339,213";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -6509,15 +6567,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'and F_CreateUser='" + nowUser.F_UserCode + "' order by F_ID desc");
             if (itemlast != null && itemlast.Count > 0)
             {
-                if (markdepts.Contains(nowUser.F_DeptId.ToString()))
-                {
-                    var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + nowUser.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
-                    if (itemlast.Count == 2 || itemnext.F_Flag == 9)
-                    {
-                        flag = 3;
-                        model.F_Flag = 9;
-                    }
-                }
+                //if (markdepts.Contains(nowUser.F_DeptId.ToString()))
+                //{
+                //    var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + nowUser.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
+                //    if (itemlast.Count == 2 || itemnext.F_Flag == 9)
+                //    {
+                //        flag = 3;
+                //        model.F_Flag = 9;
+                //    }
+                //}
                 foreach (var item in itemlast)
                 {
                     touser = item.F_NextUser;
@@ -6705,17 +6763,17 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? cont : model.F_SuperiorOpinion + "； " + cont;
                 }
-                if (!string.IsNullOrEmpty(eventreason))
-                {
-                    if (flag == 1)
-                    {
-                        model.F_EventReason = eventreason;
-                    }
-                    else if (flag == 2)
-                    {
-                        model.F_EventReason2 = eventreason;
-                    }
-                }
+                //if (!string.IsNullOrEmpty(eventreason))
+                //{
+                //    if (flag == 1)
+                //    {
+                //        model.F_EventReason = eventreason;
+                //    }
+                //    else if (flag == 2)
+                //    {
+                //        model.F_EventReason2 = eventreason;
+                //    }
+                //}
 
                 model.F_DealTime = DateTime.Now;
                 InToworkModel(model, input);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -1010,6 +1010,9 @@ namespace CallCenterApi.Interface.Models.Input
         public string SuperiorOpinion2 { get; set; }
 
         public int F_Flag { get; set; }
+        
+        public int? inout { get; set; }
+        public int? woflag { get; set; }
 
         #region 多物料
         public List<T_Wo_MaterialItems> MaterialItems { get; set; }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -17,8 +17,8 @@
     <add key="smssign" value=""/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=.;User ID=sa;pwd=sa123456;Initial Catalog=CallCenter_XinXiangXLX;"/>
-  <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_XinXiangXLX;" />-->
+    <!--<add name="ConnectionString" connectionString="Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=xinlianxin;"/>-->
+  <add name="ConnectionString" connectionString="Data Source=.;User ID=sa;pwd=sa123456;Initial Catalog=CallCenter_XinXiangXLX0629;" />
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5"/>

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrderItem_New.cs

@@ -178,7 +178,7 @@ namespace CallCenterApi.Model
             get { return _f_type; }
         }
         /// <summary>
-        /// 1单线外2单线内3双线
+        /// 1单线外2单线内3双线9自动流转市场管理科可以双线指派的工单
         /// </summary>
         public int F_Flag { get; set; }
         #endregion Model