分支

codegit/CallCenterApi/CallCenterApi.BLL/T_Wo_TempStorage.cs

@@ -55,6 +55,15 @@ namespace CallCenterApi.BLL
         {
             return dal.DeleteList(F_Idlist);
         }
+        /// <summary>
+        /// 条件删除
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public bool DelteByWhere(string where)
+        {
+            return dal.DelteByWhere(where);
+        }
 
         /// <summary>
         /// 得到一个对象实体

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_TempStorage.cs

@@ -152,7 +152,29 @@ namespace CallCenterApi.DAL
                 return false;
             }
         }
-
+        /// <summary>
+        /// 添加删除
+        /// </summary>
+        /// <param name="where"></param>
+        /// <returns></returns>
+        public bool DelteByWhere(string where)
+        {
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("delete from T_Wo_TempStorage ");
+            if (where.Trim() != "")
+            {
+                strSql.Append(" where " + where);
+            }
+            int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
+            if (rows > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
 
         /// <summary>
         /// 得到一个对象实体

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

@@ -1,6 +1,7 @@
 
 using CallCenter.Utility;
 using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Model;
 using CallCenterAPI.WechatSDK;
 using Newtonsoft.Json;
 using System;
@@ -324,6 +325,21 @@ namespace CallCenterApi.Interface.Controllers
 
         }
 
+        public ActionResult mytest(string question2)
+        {
+            string sql = "";
+            string squsdf = string.Format("'{0}'", question2.Replace(",", "','"));
+            var QuestionManage = new BLL.T_Wo_QuestionManage().GetModelList("F_QuestionName in (" + squsdf + ")");
+            if (QuestionManage != null)
+            {
+                if (QuestionManage.FirstOrDefault().F_Type == EnumWOType.Complaint.ToString())
+                {
+                    sql += $"  and T_Wo_WorkOrder.F_QuestionType  in (" + string.Join(",", QuestionManage.Select(T => T.F_Id)) + ")"; ;
+                }
+            }
+            return Success(sql);
+        }
+
 
     }
 }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RoleInfoController.cs

@@ -52,7 +52,7 @@ namespace CallCenterApi.Interface.Controllers
                 "F_RoleId",
                 "*",
                 sql,
-                "",
+                "ORDER BY F_RoleId desc",
                 pageSize,
                 pageIndex,
                 true,

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -380,8 +380,12 @@ namespace CallCenterApi.Interface.Controllers.customer
                 var model = new object();
                 var sql = $" and  F_LegalPhone  = '" + tel.Trim() + "'";
                 var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
-                if (tel.Trim().Length == 11 && tel.Substring(0, 1) != "0")
+                if (tel.Trim().Length == 11 || tel.Trim().Length == 12 )
                 {
+                    if (tel.Substring(0, 1) == "0")
+                    {
+                        tel=tel.Substring(1, tel.Length-1);
+                    }
                     BLL.T_Sys_MobileData mobile_Bll = new BLL.T_Sys_MobileData();
                     Model.T_Sys_MobileData mobileModel = mobile_Bll.GetModelList(" F_MobileNum='" + tel.Substring(0, 7) + "' ").FirstOrDefault();
 

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

@@ -854,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 = (path+filePathName).Replace('\\', '/');//附件地址
+                        model_T_Sys_Accessories.F_FileUrl = filePathName.Replace('\\', '/');//附件地址
                         model_T_Sys_Accessories.F_Size = size;
                         //     model_T_Sys_Accessories.F_UserCode = userCode;//上传人  
                         model_T_Sys_Accessories.F_OriName = oriname;

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

@@ -1092,7 +1092,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 if (GetDeptUserCode(ua.F_DeptId) != "")
                                 {
                                     //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
-                                    sql += " and ((F_State in(10,11) and F_Flag = null ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
+                                    sql += " and ((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                                     sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
                                 }
                                 //  sql += " and F_State in(10,11) and F_DealBy = '" + ua.F_UserCode + "' ";
@@ -1309,7 +1309,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
                 if (modlelist.Count > 0)
                 {
-                    List<WorkOrderNewInput> Input = modeltooip(modlelist, ua);
+                    List<WorkOrderNewInput> Input = modeltooip(modlelist, ua,state);
                     var obj = new
                     {
                         state = "success",
@@ -1542,7 +1542,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,295,339,422,213,427";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
                         string qualdepts = "12,36,295,245";
                         string detpid = "" + ua.F_DeptId;
                         var deparmentlist = new List<Model.T_Sys_Department>();
@@ -1922,7 +1922,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         sql = "";
                         sql += $"  F_IsDelete=0";
                         //sql += " and (F_State in(10,11) or  F_State2 in(10,11))";
-                        sql += " and ((F_State in(10,11) and F_Flag = null ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
+                        sql += " and ((F_State in(10,11) and isnull(F_Flag,0)=0 ) or (F_Flag=2 and F_State2 in(10,11)) or  (F_Flag=1 and F_State in(10,11)) or (F_Flag=3 and(F_State in(10,11) or F_State2 in(10,11))))";
                         if (GetDeptUserCode(ua.F_DeptId) != "")
                         {
                             sql += "  and F_DealBy in(" + GetDeptUserCode(ua.F_DeptId) + ") ";
@@ -2091,7 +2091,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,295,339,422,213,427";
+                            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
                             string qualdepts = "12,36,295,245";
                             string detpid = "" + ua.F_DeptId;
                             var deparmentlist = new List<Model.T_Sys_Department>();
@@ -2223,31 +2223,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         #region 添加注解表
-                        Model.T_Wo_AnnotationTab annotab = new T_Wo_AnnotationTab();
-                        annotab.F_Contents = cont;
-                        annotab.F_AnnotationPerson = ua.F_UserCode;
-                        annotab.F_CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-                        annotab.F_Wocode = model.F_ID;
-                        new BLL.T_Wo_AnnotationTab().Add(annotab);
+                        //Model.T_Wo_AnnotationTab annotab = new T_Wo_AnnotationTab();
+                        //annotab.F_Contents = cont;
+                        //annotab.F_AnnotationPerson = ua.F_UserCode;
+                        //annotab.F_CreateTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                        //annotab.F_Wocode = model.F_ID;
+                        //new BLL.T_Wo_AnnotationTab().Add(annotab);
                         #endregion
-                        Annotationstr = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        //Annotationstr = cont + "-" + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                        Annotationstr = ua.F_UserName + "(" + ua.F_WorkNumber + ")" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "  " + cont + "；";
                         if (flag == 1)
                         {
-                            if (ro.F_RoleCode == "XTGLY")
-                            {
-                                model.F_Annotation = Annotationstr;
-                            }
-                            else
-                            {
-                                if (string.IsNullOrEmpty(model.F_Annotation))
-                                {
-                                    model.F_Annotation = Annotationstr;
-                                }
-                                else
-                                {
-                                    model.F_Annotation = model.F_Annotation + "\n" + Annotationstr;
-                                }
-                            }
+                            model.F_Annotation = Annotationstr;
 
 
                         }
@@ -2269,7 +2256,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,213,427) 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,427,433) order by F_CreateTime desc)";
                             var deptmodel = departmentBLL.GetModelList(strwhere).FirstOrDefault();
                             if (deptmodel != null)
                             {
@@ -2750,8 +2737,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
             }
             else if (CirculMarket(ua.F_DeptId, 20))
             {
-                nextda = 295;
-                opt = "流转新乡黑科质检";
+                nextda = 422;
+                opt = "流转营销中心市场科";
+                //nextda = 295;
+                //opt = "流转新乡黑科质检";
             }
             else if (CirculMarket(ua.F_DeptId, 332))
             {
@@ -2840,7 +2829,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(OpenId))
             {
                 int woflag = 0;
-                string markdepts = "37,57,74,88,268,295,339,213,427";
+                string markdepts = "37,57,74,88,268,295,339,213,427,433";
                 string sqlstr = "";
                 if (id <= 0)
                 {
@@ -2906,7 +2895,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// 查询工单详情
         /// </summary>
         [WechatActionFilter]
-        public ActionResult GetDetails(string OpenId, int id,int flag=1)
+        public ActionResult GetDetails(string OpenId, int id,int flag=1,int state=0)
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
@@ -2950,7 +2939,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 if (list.Count > 0)
                 {
-                    List<WorkOrderNewInput> Input = modeltooip(list, ua);
+                    List<WorkOrderNewInput> Input = modeltooip(list, ua,state);
                     if (Input != null)
                     {
                         var obj = new
@@ -2983,22 +2972,72 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// </summary>
         /// <param name="fid"></param>
         /// <returns></returns>
-        public int? GetNodeState(int fid, string usercode)
+        public int? GetNodeState(int fid, string usercode, int state = 0)
         {
             int? flag = 0;
 
-            string markdepts = "37,57,74,88,268,295,339,213,427";
+            string markdepts = "37,57,74,88,268,295,339,213,427,433";
             if (!string.IsNullOrEmpty(usercode))
             {
                 Model.T_Sys_UserAccount ua = userAccountBLL.GetModel(usercode);
                 var itemlast = 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").FirstOrDefault();
                 if (itemlast != null)
                 {
+                    int? wostate1 = 0, wostate2 = 0; int i = 0;
                     //if (!markdepts.Contains(ua.F_DeptId.ToString()))
                     //{
+                    if (state == 2)
+                        state = 1;
+                    else if (state == 4)
+                        state = 2;
+                    else
+                        state = 0;
                     if (itemlast.F_Flag != 9)
                     {
-                        flag = itemlast.F_Type;
+                        var itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc");
+                        if (itemnext.Count > 0 && itemnext.Count == 2)
+                        {
+                            foreach (var item in itemnext)
+                            {
+                                if (i == 0)
+                                {
+                                    wostate1 = item.F_WoState;
+                                }
+                                else
+                                {
+                                    wostate2 = item.F_WoState;
+                                }
+                                i++;
+                            }
+                            if (wostate1 == wostate2 || (wostate2 == 2 && wostate1 == 17) || (wostate1 == 2 && wostate2 == 17))
+                            {
+                                flag = 3;//需要判断处理内线还是外线
+                            }
+                            else if (state > 0)
+                            {
+                                flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
+                            }
+                        }
+                        else if (itemnext.Count > 0)
+                        {
+                            flag = itemnext.FirstOrDefault().F_Type;
+                        }
+                        else
+                        {
+                            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.Count > 0 && itemnext2.Count == 2)
+                            {
+                                flag = 3;
+                            }
+                            else if (itemnext2.Count > 0)
+                            {
+                                flag = itemnext2.FirstOrDefault().F_Type;
+                            }
+                            else
+                            {
+                                flag = itemlast.F_Type;
+                            }
+                        }
                     }
                     //}
                     else if (itemlast.F_Flag == 9)
@@ -3009,18 +3048,45 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         else
                         {
-                            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 itemnext = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_IsUsed=0 and  F_WoID='" + fid + "' and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc");
+                            if (itemnext.Count > 0 && itemnext.Count == 2)
+                            {
+                                foreach (var item in itemnext)
+                                {
+                                    if (i == 0)
+                                    {
+                                        wostate1 = item.F_WoState;
+                                    }
+                                    else
+                                    {
+                                        wostate2 = item.F_WoState;
+                                    }
+                                    i++;
+                                }
+                                if (wostate1 == wostate2 || (wostate2 == 2 && wostate1 == 17) || (wostate1 == 2 && wostate2 == 17))
+                                {
+                                    flag = 3;//需要判断处理内线还是外线
+                                }
+                                else if (state > 0)
+                                {
+                                    flag = itemnext.Where(t => t.F_WoState == state || t.F_WoState == 17 || t.F_WoState == 4 || t.F_WoState == 3).FirstOrDefault().F_Type;
+                                }
+                            }
+                            else if(itemnext.Count > 0)
+                            {
+                                flag = itemnext.FirstOrDefault().F_Type;
+                            }
+                            else
                             {
                                 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)
+                                if (itemnext2.Count > 0)
+                                {
                                     foreach (var item in itemnext2)
                                     {
-                                        if(item.F_WoState!=10)
-                                        flag = item.F_Type;
+                                        if (item.F_WoState != 10)
+                                            flag = item.F_Type;
                                     }
+                                }
                             }
                         }
                     }
@@ -3252,7 +3318,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         /// 根据model返回CustomerBaseNewInput对象
         /// </summary>
-        private List<WorkOrderNewInput> modeltooip(List<Model.T_Wo_WorkOrder> model1, Model.T_Sys_UserAccount ua)
+        private List<WorkOrderNewInput> modeltooip(List<Model.T_Wo_WorkOrder> model1, Model.T_Sys_UserAccount ua,int state=0)
         {
             if (model1 != null && model1.Count > 0)
             {
@@ -3592,9 +3658,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     else
                         model.F_TS_Quantity = "";
                     model.F_TS_Level = model1[i].F_TS_Level;//投诉-重要级别：轻微、一般、较大、重大
-                    if (model1[i].MaterialItems != null)
+                    if (model1[i].F_SC_PreliminaryOpinion == "退换货")
                     {
-                        model.MaterialItems = model1[i].MaterialItems;  //退换货多物料信息
+                        List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={model.F_ID}");
+                        if (materlist != null)
+                        {
+                            model.MaterialItems = materlist;
+                            model.F_ZL_Fquantity = materlist.Sum(x => x.F_ReturnQuantity).ToString();
+                        }
                     }
                     else
                         model.MaterialItems = null;
@@ -3642,7 +3713,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_ZL_CompensationMethod = model1[i].F_ZL_CompensationMethod;//质量管理科-补偿方式（实物、钱款【单位元】，若选择钱款，增加输入框输入补充内容）
                     model.F_ZL_CompensationMoney = model1[i].F_ZL_CompensationMoney;// 质量管理科-补偿钱款
                     model.F_ZL_CResponsibleUnits = model1[i].F_ZL_CResponsibleUnits;//质量管理科-对应责任单位（生产、研发、农化、物流、质量管理科，销售内勤）
-                    model.F_ZL_Fquantity = model1[i].F_ZL_Fquantity;// 质量管理科-确认实收数量（吨）
+                    //model.F_ZL_Fquantity = model1[i].F_ZL_Fquantity;// 质量管理科-确认实收数量（吨）
                     model.F_ZL_ImprovementRequirements = model1[i].F_ZL_ImprovementRequirements;//质量管理科-改进要求
                     model.F_ZL_CApprovalNo = model1[i].F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
                     model.F_ZL_CJ_IsRecord = model1[i].F_ZL_CJ_IsRecord;//质量管理科-抽检-未备案、已备案
@@ -3814,7 +3885,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_Manufacturers = model1[i].F_Manufacturers;//质量管理科-原料及厂家
                     model.F_ProductionNum = model1[i].F_ProductionNum;//质量管理科-该批次生产数量
                     model.F_Flag = model1[i].F_Flag;//1单线外 2单线内 3双线 9市场科可以双线指派工单 0 未指派工单
-                    model.inout = GetNodeState(model1[i].F_ID,ua.F_UserCode);
+                    model.inout = GetNodeState(model1[i].F_ID,ua.F_UserCode,state);
                     if (ua != null)
                     {
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
@@ -4800,7 +4871,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     var tempmodel = new BLL.T_Wo_TempStorage().GetModel(tempid);
                     if (tempmodel != null)
-                        new BLL.T_Wo_TempStorage().Delete(tempid);
+                        new BLL.T_Wo_TempStorage().DelteByWhere($"F_CreateBy={ua.F_UserCode}");
                 }
                 #endregion
 
@@ -4894,8 +4965,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
                                 else if (CirculMarket(ua.F_DeptId, 20))
                                 {
-                                    nextda = 295;
-                                    opt = "流转新乡黑科质检";
+                                    nextda = 422;
+                                    opt = "流转营销中心市场科";
+                                    //nextda = 295;
+                                    //opt = "流转新乡黑科质检";
                                 }
                                 else if (CirculMarket(ua.F_DeptId, 332))
                                 {
@@ -5101,7 +5174,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
         [WechatActionFilter]
         public ActionResult AssignWorkOrder(string OpenId, long orderid, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
-            int overtime = 0, int sms = -1, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="", int flag = 1)
+            int overtime = 0, int sms = -1, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="", int flag = 1,int inoutflag = 0)
         {
 
             if (!string.IsNullOrEmpty(OpenId))
@@ -5140,7 +5213,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                      sms = (int)itemlast.F_IsSMS;
                 }
                 WorkOrderNewInput input = new WorkOrderNewInput();
-                string markdepts = "37,57,74,88,268,295,339,422,213,427";
+                string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
                 string qualdepts = "12,36,295,245";
                 if (ua != null)
                 {
@@ -5204,7 +5277,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("请选择接收部门");
                             }
                             var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
-                            DealWO(ua, model,"", input, "", 1, "", 1,"", flag);
+                            Overorder(ua, model, 1);
                         }
                         else
                         {
@@ -5213,7 +5286,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("请选择接收部门");
                             }
                             var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag);
-                            DealWO(ua, model, "", input, "", 1, "", 2, "", flag);
+                            Overorder(ua, model, 2);
                         }
                         return Success("转派成功");
                     }
@@ -5264,33 +5337,33 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                             input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 质量管理科-责任单位（需列出，可选多个）
 
                                         }
-                                        else if (deptmodel.F_DeptName == "成品库" && model.F_SC_PreliminaryOpinion == "退换货" ) //退换货成品库录入物料信息
-                                        {
-                                            if (!string.IsNullOrEmpty(jsonstr))
-                                            {
-                                                JavaScriptSerializer Serializer = new JavaScriptSerializer();   //实例化⼀个能够序列化数据的类
-                                                List<Material> list = Serializer.Deserialize<List<Material>>(jsonstr);
-                                                List<T_Wo_MaterialItems> itemlist = new List<T_Wo_MaterialItems>();
-
-                                                if (list != null && list.Count > 0)
-                                                {
-                                                    foreach (var item in list)
-                                                    {
-                                                        T_Wo_MaterialItems itemodel = new T_Wo_MaterialItems();
-                                                        itemodel.F_MaterialCode = item.materialcode;
-                                                        itemodel.F_MaterialName = item.materialname;
-                                                        itemodel.F_Formula = item.formula;
-                                                        itemodel.F_ReturnQuantity = item.returnum??0;
-                                                        itemodel.F_WoID = model.F_ID;//工单id
-                                                        itemodel.F_CreateOn = DateTime.Now;
-                                                        itemodel.F_Remark = item.specs;//规格
-                                                        itemlist.Add(itemodel);
-                                                    }
-                                                    model.MaterialItems = itemlist;
-                                                }
-                                            }
+                                        //else if (deptmodel.F_DeptName == "成品库" && model.F_SC_PreliminaryOpinion == "退换货" ) //退换货成品库录入物料信息
+                                        //{
+                                        //    if (!string.IsNullOrEmpty(jsonstr))
+                                        //    {
+                                        //        JavaScriptSerializer Serializer = new JavaScriptSerializer();   //实例化⼀个能够序列化数据的类
+                                        //        List<Material> list = Serializer.Deserialize<List<Material>>(jsonstr);
+                                        //        List<T_Wo_MaterialItems> itemlist = new List<T_Wo_MaterialItems>();
+
+                                        //        if (list != null && list.Count > 0)
+                                        //        {
+                                        //            foreach (var item in list)
+                                        //            {
+                                        //                T_Wo_MaterialItems itemodel = new T_Wo_MaterialItems();
+                                        //                itemodel.F_MaterialCode = item.materialcode;
+                                        //                itemodel.F_MaterialName = item.materialname;
+                                        //                itemodel.F_Formula = item.formula;
+                                        //                itemodel.F_ReturnQuantity = item.returnum??0;
+                                        //                itemodel.F_WoID = model.F_ID;//工单id
+                                        //                itemodel.F_CreateOn = DateTime.Now;
+                                        //                itemodel.F_Remark = item.specs;//规格
+                                        //                itemlist.Add(itemodel);
+                                        //            }
+                                        //            model.MaterialItems = itemlist;
+                                        //        }
+                                        //    }
 
-                                        }
+                                        //}
                                         else if (deptmodel.F_DeptId == 248 && model.F_SC_PreliminaryOpinion == "退换货")
                                         {
                                             input.F_CarNumber = deptment.CarNumber;//返厂车牌号
@@ -5371,8 +5444,23 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("请选择接收部门");
                             }
                         }
-                        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();
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, Convert.ToInt32(modellist.F_Type));
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextUser like '%{ua.F_UserCode}%' and F_IsUsed=0 order by   F_ID desc ");
+                        int? zflag = 0;
+                        if (inoutflag != 0)
+                        {
+                            zflag = inoutflag;
+                        }
+                        else if (modellist.Count > 0)
+                        {
+                            zflag = modellist.FirstOrDefault().F_Type;
+                        }
+                        if (zflag != 3)
+                        {
+                            var modeldpts = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and  F_NextDept={clbm} and F_Type not in({zflag},3) and F_Flag=3 order by   F_ID desc ").FirstOrDefault();
+                            if (modeldpts != null)
+                                return Error("不允许同一个部门出现在两条线内,请重新指派！");
+                        }
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, Convert.ToInt32(zflag));
                         if (res)
                         {
                             return Success("转派成功");
@@ -5386,6 +5474,66 @@ namespace CallCenterApi.Interface.Controllers.weixin
             return Error("无操作权限！");
         }
         /// <summary>
+        /// 完结工单
+        /// </summary>
+        /// <param name="nowUser"></param>
+        /// <param name="model"></param>
+        /// <param name="isOver"></param>
+        /// <param name="flag"></param>
+        /// <returns></returns>
+        public bool Overorder(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, int isOver = 0)
+        {
+            #region 工单处理
+            int sms = 0;
+            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.visit + " and  F_WoID=" + model.F_ID + " ");
+            if (itemlasts.Count > 0)
+            {
+                foreach (var it in itemlasts)
+                {
+                    if (it.F_WoState == 1)
+                    {
+                        sms = int.Parse(it.F_IsSMS.ToString());
+                    }
+                }
+            }
+            int optbut = (int)EnumItemOpt.end;
+            int wostate = (int)EnumWorkOrderState.evaluate;
+
+            #region 读取当前登录人部门
+            string deptname = "";
+            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
+            if (deptmodel != null)
+            {
+                deptname = deptmodel.F_DeptName + "-";
+            }
+            #endregion
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") 完结工单";
+
+            //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
+            if (isOver >= 1)
+            {
+                #region 处理工单
+                model.F_VisitOn = DateTime.Now;
+                if (isOver == 1)
+                {
+                    AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit, sms, "", 0, 1);
+                    model.F_State = wostate;  //外线关闭
+                }
+                else if (isOver == 2)
+                {
+                    AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit, sms, "", 0, 2);
+                    model.F_State2 = wostate; //内线关闭
+                }
+                
+                woBLL.Update(model);
+                #endregion
+                return true;
+            }
+            else
+                return false;
+            #endregion
+        }
+        /// <summary>
         /// 转派工单
         /// </summary>
         public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int  isbl=0, int flag = 1, int flagstate = 0)
@@ -5544,7 +5692,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 #region 处理工单
                 //工单完结要更新工单的状态
                 //   model.F_DealBy = touser;
-                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -5900,7 +6048,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
 
         [WechatActionFilter]
-        public ActionResult SureWorkOrder(long orderid, string OpenId)
+        public ActionResult SureWorkOrder(long orderid, string OpenId,int inoutflag=0)
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
@@ -5911,6 +6059,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
                     if (model != null)
                     {
+                        int? zflag = 0;
                         //string strsql = "";
                         //if (ua.F_Flag == 1)
                         //{
@@ -5934,7 +6083,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (isused <= 0)
                                 return Error("工单已接单无需重新接单");
                         }
-                        int? zflag = modellist.F_Type;
+                        if (inoutflag != 0)
+                        {
+                            zflag = inoutflag;
+                        }
+                        else
+                        {
+                            zflag = modellist.F_Type;
+                        }
                         var res = SureWO(ua, model, Convert.ToInt32(zflag));
                         if (res)
                             return Success("接单成功");
@@ -6036,7 +6192,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (itemid > 0)
             {
                 #region 处理工单
-                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0)  && flag == 3))
                 {
                     model.F_State = wostate;//已接单待处理
                 }
@@ -6049,7 +6205,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_State = wostate;//已接单待处理
                     model.F_State2 = wostate;//已接单待处理
                 }
-                model.F_DealBy = nowUser.F_UserCode;//已接单待处理
+                //model.F_DealBy = nowUser.F_UserCode;//已接单待处理
                 woBLL.Update(model);
                 #endregion
                 #region 推送消息
@@ -6088,9 +6244,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
         [WechatActionFilter]
         public ActionResult DealWorkOrder(string OpenId, long orderid, string F_Files, string cont, WorkOrdeDeptment deptment,
          string uncont = "",
-        int isvisit = 1, int isover = 0)
+        int isvisit = 1, int isover = 0, int inoutflag = 0)
         {
-            string markdepts = "37,57,74,88,268,295,339,422,213,427";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
             string qualdepts = "12,36,295,245";
             if (!string.IsNullOrEmpty(OpenId))
             {
@@ -6120,6 +6276,17 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             //    strsql = " and F_Type in(2,3)";
                             //}
                             var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + " and F_IsUsed=0 and F_NextUser like '%" + ua.F_UserCode + "%' order by  F_ID desc ").FirstOrDefault();
+
+                            int? zflag = 0;
+                            if (inoutflag != 0)
+                            {
+                                zflag = inoutflag;
+                            }
+                            else
+                            {
+                                zflag = modellist.F_Type;
+                            }
+
                             if (modellist == null)
                             {
                                 //if (modellist.F_NextUser != ua.F_UserCode)
@@ -6147,7 +6314,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));
+                                var res = DealWO(ua, model, F_Files, input, cont, isover, uncont, Convert.ToInt32(zflag));
                                 if (res)
                                     return Success("处理成功");
                                 else
@@ -6260,7 +6427,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
 
         [WechatActionFilter]
-        public ActionResult BackWorkOrder(string OpenId, long orderid, string cont, int type = 0)
+        public ActionResult BackWorkOrder(string OpenId, long orderid, string cont, int type = 0, int inoutflag = 0)
         {//办理人员和监管可以退回工单
             if (!string.IsNullOrEmpty(OpenId))
             {
@@ -6274,28 +6441,36 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,213,427";
-                        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();
+                        //string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
+                        var modellist = new BLL.T_Wo_WorkOrderItem_New().GetModelList($"F_WoID={model.F_ID} and F_IsUsed=0 and  F_NextUser like '%{ua.F_UserCode}%'  order by   F_ID desc ").FirstOrDefault();
+
 
                         if (modellist == null)
                         {
                             return Error("非接单人不可操作工单");
                         }
 
-                        if (!string.IsNullOrEmpty(modellist.F_CreateUser))
+                        //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;
+                        //        }
+
+                        //    }
+                        //}
+                        if (inoutflag != 0)
                         {
-                            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 = inoutflag;
+                        }
+                        else
+                        {
+                            flag = Convert.ToInt32(modellist.F_Type);
                         }
-                        flag = Convert.ToInt32(Convert.ToInt32(modellist.F_Type));
                         var res = BackWO(ua, model, cont, type, flag);
                         if (res)
                             return Success("退回成功");
@@ -6316,7 +6491,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <param name="cont"></param>
         /// <returns></returns>
         [WechatActionFilter]
-        public ActionResult RevokeWo(string OpenId, long orderid, string cont)
+        public ActionResult RevokeWo(string OpenId, long orderid, string cont, int inoutflag = 0)
         {
 
             if (!string.IsNullOrEmpty(OpenId))
@@ -6330,7 +6505,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         int flag = 0;
-                        string markdepts = "37,57,74,88,268,295,339,422,213,427";
+                        string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
                         Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                         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 ");
 
@@ -6341,38 +6516,45 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 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")
+                            if (inoutflag != 0)
                             {
-                                flag = 3;
+                                flag = inoutflag;
                             }
-                            else if (modellist != null && modellist.Count > 0)
+                            else
                             {
-                                if (markdepts.Contains(ua.F_DeptId.ToString()))
+                                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)
                                 {
-                                    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)
+                                    if (markdepts.Contains(ua.F_DeptId.ToString()))
                                     {
-                                        flag = 3;
-                                        model.F_Flag = 9;
+                                        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;
+                                        }
                                     }
-                                    else if (itemnext.F_Flag == 9)
+                                    if (flag == 0)
                                     {
-                                        flag = 3;
-                                        model.F_Flag = 9;
+                                        flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
                                     }
                                 }
-                                if (flag == 0)
+                                else
                                 {
-                                    flag = Convert.ToInt32(modellist.FirstOrDefault().F_Type);
+                                    return Error("无操作权限");
                                 }
                             }
-                            else
-                            {
-                                return Error("无操作权限");
-                            }
                             var res = RevWO(ua, model, cont, flag);
                             if (res)
                                 return Success("撤回成功");
@@ -6559,7 +6741,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 #region 处理工单
                 if (deptid == 2)
                 {
-                    if (flag == 1 || (model.F_Flag == null && flag == 3))
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
                         model.F_State = (int)EnumWorkOrderState.reassign;
                     }
@@ -6570,7 +6752,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 else
                 {
-                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
                         model.F_State = wostate;
                     }
@@ -6607,7 +6789,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             #region 工单处理
             int sms = 0;
-            string markdepts = "37,57,74,88,268,295,339,422,213,427";
+            string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
             var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + model.F_ID + " ");
             if (itemlasts.Count > 0)
             {
@@ -6709,7 +6891,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 //}
                 #endregion
                 #region 处理工单
-                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0)  && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -6797,7 +6979,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (itemid > 0)
             {
                 #region 处理工单
-                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && model.F_State2 == 10 && flag == 3))
+                if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0)  && flag == 3))
                 {
                     model.F_State = wostate;
                 }
@@ -6838,7 +7020,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             model.F_DealContent += cont + "；";
                         }
                     }
-                    if (flag == 1 || (model.F_Flag == null && flag == 3))
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
                         model.F_SuperiorOpinion = cont;
                     }
@@ -7104,58 +7286,60 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel1 != null)
                         {
-                            deptname1 = deptmodel1.F_DeptName ;
+                            deptname1 = deptmodel1.F_DeptName;
                             dapt = deptmodel1.F_ParentId;
                         }
                         //if (dapt != 0)
                         //{
-                            if (CirculMarket(ua.F_DeptId, 11))
-                            {
-                                nextda = 427;
-                                opt = "流转运营中心";
-                            }
-                            else if (CirculMarket(ua.F_DeptId, 14))
-                            {
-                                nextda = 57;
-                                opt = "流转营销管理处";
-                            }
-                            else if (CirculMarket(ua.F_DeptId, 15))
-                            {
-                                nextda = 74;
-                                opt = "流转策划推广";
-                            }
-                            else if (CirculMarket(ua.F_DeptId, 16))
-                            {
-                                nextda = 88;
-                                opt = "流转销售部";
-                            }
-                            else if (CirculMarket(ua.F_DeptId, 18))
-                            {
-                                nextda = 268;
-                                opt = "流转车用尿素";
+                        if (CirculMarket(ua.F_DeptId, 11))
+                        {
+                            nextda = 427;
+                            opt = "流转运营中心";
+                        }
+                        else if (CirculMarket(ua.F_DeptId, 14))
+                        {
+                            nextda = 57;
+                            opt = "流转营销管理处";
+                        }
+                        else if (CirculMarket(ua.F_DeptId, 15))
+                        {
+                            nextda = 74;
+                            opt = "流转策划推广";
+                        }
+                        else if (CirculMarket(ua.F_DeptId, 16))
+                        {
+                            nextda = 88;
+                            opt = "流转销售部";
+                        }
+                        else if (CirculMarket(ua.F_DeptId, 18))
+                        {
+                            nextda = 268;
+                            opt = "流转车用尿素";
 
-                            }
+                        }
 
-                            else if (CirculMarket(ua.F_DeptId, 20))
-                            {
-                                nextda = 295;
-                                opt = "流转新乡黑科质检";
-                            }
-                            else if (CirculMarket(ua.F_DeptId, 332))
-                            {
-                                nextda = 339;
-                                opt = "流转营销管理处";
+                        else if (CirculMarket(ua.F_DeptId, 20))
+                        {
+                            nextda = 422;
+                            opt = "流转营销中心市场科";
+                            //nextda = 295;
+                            //opt = "流转新乡黑科质检";
+                        }
+                        else if (CirculMarket(ua.F_DeptId, 332))
+                        {
+                            nextda = 339;
+                            opt = "流转营销管理处";
 
-                            }
-                            else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
-                            {
-                                nextda = ua.F_DeptId;
-                                opt = "流转" + deptname1;
-                            }
+                        }
+                        else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                        {
+                            nextda = ua.F_DeptId;
+                            opt = "流转" + deptname1;
+                        }
                         //}
                         if (nextda != 0)
                         {
-                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms,0,0,0,"",1 );
+                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms, 0, 0, 0, "", 1);
                             if (res)
                                 return Success("保存成功");
                             else
@@ -7205,14 +7389,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (flag != 3)
                     flagstr = $" and F_Type in({ flag},3)";
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
-                if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY" && flag != 3)
-                {
-                    strsql = $" F_OptType !=1 and isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  F_CreateUser={nowUser.F_UserCode}{flagstr}";
-                }
-                else
-                {
-                    strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  (F_CreateUser={nowUser.F_UserCode} or F_NextUser like '%{nowUser.F_UserCode}%'){flagstr}";
-                }
+                strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  (F_CreateUser={nowUser.F_UserCode} or F_NextUser like '%{nowUser.F_UserCode}%'){flagstr}";
+                //if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX" || ro.F_RoleCode == "XTGLY")
+                //{
+                //    strsql = $" F_OptType !=1 and isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  F_CreateUser={nowUser.F_UserCode}{flagstr}";
+                //}
+                //else
+                //{
+                //    strsql = $" isnull(F_IsUsed,'0')='0' and F_ItemType={itemtype} and  F_WoID={woid} and  (F_CreateUser={nowUser.F_UserCode} or F_NextUser like '%{nowUser.F_UserCode}%'){flagstr}";
+                //}
             }
             else
             {

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

@@ -17,8 +17,8 @@
     <add key="smssign" value=""/>
   </appSettings>
   <connectionStrings>
-    <!--<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;" />
+    <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_XinXiangXLX0712;" />-->
   </connectionStrings>
   <system.web>
     <compilation debug="true" targetFramework="4.5"/>