工单类型修改，工单完结，工单退回

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

@@ -2469,7 +2469,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         [WechatActionFilter]
         public bool Approval(string OpenId, long orderid, string AuditCont, Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, float overtime = 0, int sms = -1, int IsAudit = 0, int AuditState = 0)
         {
-            bool res = true;
+            int res = 1;
             string touser = ""; string tousername = "";
             string opt = "审核";
             #region 获取接收人
@@ -2517,7 +2517,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         if (userid <= 0 || uaid <= 0)
-                            res = false;
+                            res = 0;
                         else
                         {
                             if (sms ==1&& !string .IsNullOrEmpty(user .F_Mobile ))
@@ -2532,7 +2532,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         opt = "驳回修订";
                         var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                         if (userid <= 0)
-                            res = false;
+                            res = 0;
                     }
                     else
                     {
@@ -2540,7 +2540,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         wostate = 11;
                         var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                         if (userid <= 0)
-                            res = false;
+                            res = 0;
                     }
                 }
                 else
@@ -2571,8 +2571,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             opt = "同意上报";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
                             res = GetDaQucirCulation(AuditCont, nowUser, DateTime.Now.ToString(), model.F_ID, true);
-                            if (userid <= 0 || !res)
-                                res = false;
+                            if (userid <= 0 || res==0)
+                                res = 0;
                             wostate = 1;
                             woflag = 9;
                         }
@@ -2581,7 +2581,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             opt = "驳回修订";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                             if (userid <= 0)
-                                res = false;
+                                res = 0;
                             
                             wostate = 16;
                         }
@@ -2590,32 +2590,42 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             opt = "强制结案";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                             if (userid <= 0)
-                                res = false;
+                                res = 0;
                             wostate = 11;
                         }
 
                     }
                     else
                     {
-                        res = false;
+                        res = 0;
                     }
                 }
             }
 
             #endregion
             #endregion
-            if (res)
+            if (res>0)
             {
-                model.F_State = wostate;
-                if (woflag == 9)
+                if (res == 1)
                 {
-                    model.F_State2 = 0;
+                    model.F_State = wostate;
+                    //if (woflag == 9)
+                    //{
+                    //    model.F_State2 = 0;
+                    //}
+                    //else
+                    //{
+                    //    model.F_State2 = wostate;
+                    //}
+                    model.F_State2 = wostate;
+                    model.F_Flag = woflag;
                 }
-                else
+                else if (res == 2)
                 {
+                    model.F_State = wostate;
                     model.F_State2 = wostate;
+                    model.F_Flag = 3;
                 }
-                model.F_Flag = woflag;
                 //处理内容
                 if (!string.IsNullOrEmpty(AuditCont))
                     model.F_AuditCont += AuditCont + "；";
@@ -2676,7 +2686,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <param name="ua"></param>
         /// <param name="time"></param>
         /// <param name="id"></param>
-        public bool GetDaQucirCulation(string AuditCont, Model.T_Sys_UserAccount ua, string time, long id, bool istrue)
+        public int GetDaQucirCulation(string AuditCont, Model.T_Sys_UserAccount ua, string time, long id, bool istrue)
         {
             DateTime times = DateTime.Parse(time).AddHours(24);
             Model.T_Wo_WorkOrder model = woBLL.GetModel(id);
@@ -2739,8 +2749,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
             {
                 nextda = 422;
                 opt = "流转营销中心市场科";
-                //nextda = 295;
-                //opt = "流转新乡黑科质检";
+                nextda2 = 295;
+                opt2 = "流转新乡黑科质检";
+
             }
             else if (CirculMarket(ua.F_DeptId, 332))
             {
@@ -2761,18 +2772,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理已审批:" + AuditCont + "," + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
+                    }
                 }
                 else
                 {
                     cont = "分公司经理已审批:" + AuditCont + "," + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
+                    }
                 }
             }
             else
@@ -2780,27 +2791,40 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理未审批" + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "大区经理未审批" + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "大区经理未审批" + opt2;
+                    }
                 }
                 else
                 {
                     cont = "分公司经理未审批" + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "分公司经理未审批" + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "分公司经理未审批" + opt2;
+                    }
                 }
             }
             if (nextda != 0)
             {
-                model.F_Flag = 9;
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl,3,9);          
-                return res;
+                if (nextda2 != 0)
+                {
+                    model.F_Flag = 3;
+                    var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 1, 3);
+                    var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 2);
+                    return 2;
+                }
+                else
+                {
+                    model.F_Flag = 9;
+                    var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 3, 9);
+                    return 1;
+                }              
+            }
+            else
+            {
+                return 0;
             }
-            else return false;
         }
 
         /// <summary>
@@ -3083,7 +3107,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     foreach (var item in itemnext2)
                                     {
-                                        if (item.F_WoState != 10)
+                                        if (item.F_WoState != 11)
                                             flag = item.F_Type;
                                     }
                                 }
@@ -3885,9 +3909,9 @@ 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,state);
                     if (ua != null)
                     {
+                        model.inout = GetNodeState(model1[i].F_ID, ua.F_UserCode, state);
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel != null)
                         {
@@ -4913,7 +4937,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
-                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, overtime, sms );
+                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
                                 AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
                                 if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
                                 {
@@ -4923,7 +4947,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             else
                             {
                                 string deptname1 = "";
-                                int dapt = 0, nextda = 0;
+                                int dapt = 0, nextda = 0, nextda2 = 0;
                                 string deptment = "";
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                                 if (deptmodel1 != null)
@@ -4933,7 +4957,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     deptment = deptmodel1.F_DeptName;
                                 }
                                 AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
-                                string opt = "";
+                                string opt = "", opt2 = "";
                                 //if (dapt != 0)
                                 //{
                                 if (CirculMarket(ua.F_DeptId, 11))
@@ -4967,8 +4991,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     nextda = 422;
                                     opt = "流转营销中心市场科";
-                                    //nextda = 295;
-                                    //opt = "流转新乡黑科质检";
+                                    nextda2 = 295;
+                                    opt2 = "流转新乡黑科质检";
                                 }
                                 else if (CirculMarket(ua.F_DeptId, 332))
                                 {
@@ -4976,31 +5000,37 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     opt = "流转营销管理处";
 
 
-                                } 
+                                }
                                 else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
-                                    {
-                                        nextda = ua.F_DeptId;
-                                        opt = "流转" + deptment;
-                                    }
+                                {
+                                    nextda = ua.F_DeptId;
+                                    opt = "流转" + deptment;
+                                }
                                 //}
                                 if (nextda != 0)
                                 {
-                                    model.F_State = 1;
-                                    model.F_State2 = 0;
-                                    model.F_Flag = 9;
-                                    var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms,0,0,0,"",1,3,9);
-                                    if (res)
-                                        return Success("添加成功");
+                                    if (nextda2 != 0)
+                                    {
+                                        modlelist.F_Flag = 3;
+                                        AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1, 1, 3);
+                                        var res2 = AssignWO(ua, modlelist, input, opt2, "", nextda2, 0, 0, 0, 0, 0, 0, "", 1, 2, 3);
+                                    }
                                     else
-                                        return Error("流转失败！");
+                                    {
+                                        modlelist.F_State = 1;
+                                        modlelist.F_State2 = 1;
+                                        modlelist.F_Flag = 9;
+                                        var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms, 0, 0, 0, "", 1, 3, 9);
+                                    }
+                                    return Success("添加成功");
                                 }
                                 else
                                 {
                                     return Error("流转失败！");
                                 }
 
+                            }
                         }
-                    }
                         else
                         {
                             AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
@@ -6277,25 +6307,25 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             //}
                             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;
-                            }
+                            //int? zflag = 0;
+                            //if (inoutflag != 0)
+                            //{
+                            //    zflag = inoutflag;
+                            //}
+                            //else
+                            //{
+                            //    zflag = modellist.F_Type;
+                            //}
 
                             if (modellist == null)
                             {
                                 //if (modellist.F_NextUser != ua.F_UserCode)
                                 return Error("非接单人不可操作工单");
                             }
-                            if (model.F_Flag == 9)
-                            {
-                                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;// 责任单位
@@ -6308,7 +6338,24 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 input.F_TS_Level = deptment.TS_Level;//投诉-重要级别：轻微、一般、较大、重大
 
                             }
-                            
+                            int? zflag = 0;
+                            if (model.F_Flag == 9)
+                            {
+                                model.F_Flag = 1;//默认外线操作
+                                zflag = 1;
+                                Overorder(ua, model, 2);
+                            }
+                            else
+                            {
+                                if (inoutflag != 0)
+                                {
+                                    zflag = inoutflag;
+                                }
+                                else
+                                {
+                                    zflag = modellist.F_Type;
+                                }
+                            }
                             var modellast = new BLL.T_Wo_WorkOrderItem_New().GetModelList("F_WoID=" + model.F_ID + "and F_IsUsed=0   order by  F_ID desc ").FirstOrDefault();
                             if (model.F_State == 10 && model.F_State2 == 10)
                                 return Error("工单已处理请勿重复操作！");
@@ -7282,7 +7329,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
 
                         string deptname1 = "";
-                        int dapt = 0, nextda = 0; string opt = "";
+                        int dapt = 0, nextda = 0, nextda2 = 0; string opt = "", opt2 = "";
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel1 != null)
                         {
@@ -7322,8 +7369,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             nextda = 422;
                             opt = "流转营销中心市场科";
-                            //nextda = 295;
-                            //opt = "流转新乡黑科质检";
+                            nextda2 = 295;
+                            opt2 = "流转新乡黑科质检";
                         }
                         else if (CirculMarket(ua.F_DeptId, 332))
                         {
@@ -7339,11 +7386,20 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         //}
                         if (nextda != 0)
                         {
-                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms, 0, 0, 0, "", 1);
-                            if (res)
-                                return Success("保存成功");
+                            if (nextda2 != 0)
+                            {
+                                model.F_Flag = 3;
+                                AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms, 0, 0, 0, "", 1, 1, 3);
+                                var res2 = AssignWO(ua, model, input, opt2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, "", 1, 2, 3);
+                            }
                             else
-                                return Error("流转失败！");
+                            {
+                                model.F_State = 1;
+                                model.F_State2 = 1;
+                                model.F_Flag = 9;
+                                var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms, 0, 0, 0, "", 1, 3, 9);
+                            }
+                            return Success("保存成功");                        
                         }
                         else
                         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -1441,7 +1441,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         public bool Approval(long orderid, string AuditCont, Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, float overtime = 0, int sms = -1, int IsAudit = 0, int AuditState = 0)
         {
-            bool res = true;
+            int res = 1;
             string touser = ""; string tousername = "";
             string opt = "审核";
             string deptname = "";
@@ -1495,7 +1495,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         var uaid = AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, nowUser, overtime, sms);
                         if (userid <= 0 || uaid <= 0)
-                            res = false;
+                            res = 0;
                         else
                         {
                             if (sms == 1 && !string.IsNullOrEmpty(user.F_Mobile))
@@ -1509,7 +1509,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         opt = "驳回修订";
                         var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                         if (userid <= 0)
-                            res = false;
+                            res = 0;
                     }
                     else
                     {
@@ -1517,7 +1517,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         wostate = 11;
                         var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                         if (userid <= 0)
-                            res = false;
+                            res = 0;
                     }
                 }
                 else
@@ -1546,8 +1546,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             opt = "同意上报";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：同意上报" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, nowUser, overtime, sms);
                             res = GetDaQucirCulation(AuditCont, nowUser, DateTime.Now.ToString(), model.F_ID, true);
-                            if (userid <= 0 || !res)
-                                res = false;
+                            if (userid <= 0 || res==0)
+                                res = 0;
                             wostate = 1;
                             woflag = 9;
                         }
@@ -1556,7 +1556,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             opt = "驳回修订";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：驳回修订" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.reback, toussers, 0, nowUser, overtime, sms);
                             if (userid <= 0)
-                                res = false;
+                                res = 0;
                             wostate = 16;
                         }
                         else
@@ -1564,30 +1564,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             opt = "强制结案";
                             var userid = AddLog(model.F_ID, model.F_State.Value, deptmodelsname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "工单审批：强制结案" + AuditCont, (int)EnumItemType.audit, (int)EnumItemOpt.visit, "", 0, nowUser, overtime, sms);
                             if (userid <= 0)
-                                res = false;
+                                res = 0;
                             wostate = 11;
                         }
 
                     }
                     else
                     {
-                        res = false;
+                        res = 0;
                     }
                 }
             }
             #endregion
-            if (res)
+            if (res>0)
             {
-                model.F_State = wostate;
-                if (woflag == 9)
+                if (res == 1)
                 {
-                    model.F_State2 = 0;
+                    model.F_State = wostate;
+                    //if (woflag == 9)
+                    //{
+                    //    model.F_State2 = 0;
+                    //}
+                    //else
+                    //{
+                    //    model.F_State2 = wostate;
+                    //}
+                    model.F_State2 = wostate;
+                    model.F_Flag = woflag;
                 }
-                else
+                else if (res == 2)
                 {
+                    model.F_State = wostate;
                     model.F_State2 = wostate;
+                    model.F_Flag = 3;
                 }
-                model.F_Flag = woflag;
                 //处理内容
                 if (!string.IsNullOrEmpty(AuditCont))
                     model.F_AuditCont += AuditCont + "；";
@@ -1667,7 +1677,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="ua"></param>
         /// <param name="time"></param>
         /// <param name="id"></param>
-        public bool GetDaQucirCulation(string AuditCont, Model.T_Sys_UserAccount ua, string time, long id, bool istrue)
+        public int GetDaQucirCulation(string AuditCont, Model.T_Sys_UserAccount ua, string time, long id, bool istrue)
         {
             DateTime times = DateTime.Parse(time).AddHours(24);
             Model.T_Wo_WorkOrder model = workOrder.GetModel(id);
@@ -1730,8 +1740,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 nextda = 422;
                 opt = "流转营销中心市场科";
-                //nextda = 295;
-                //opt = "流转新乡黑科质检";
+                nextda2 = 295;
+                opt2 = "流转新乡黑科质检";
 
 
             }
@@ -1759,18 +1769,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理已审批:" + AuditCont + "," + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "大区经理已审批: " + AuditCont + "," + opt2;
+                    }
                 }
                 else
                 {
                     cont = "分公司经理已审批:" + AuditCont + "," + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "分公司经理已审批: " + AuditCont + "," + opt2;
+                    }
                 }
             }
             else
@@ -1778,18 +1788,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (ro.F_RoleCode == "DQJL")
                 {
                     cont = "大区经理未审批" + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "大区经理未审批" + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "大区经理未审批" + opt2;
+                    }
                 }
                 else
                 {
                     cont = "分公司经理未审批" + opt;
-                    //if (!string.IsNullOrEmpty(opt2))
-                    //{
-                    //    cont2 = "分公司经理未审批" + opt2;
-                    //}
+                    if (!string.IsNullOrEmpty(opt2))
+                    {
+                        cont2 = "分公司经理未审批" + opt2;
+                    }
                 }
             }
             if (nextda != 0)
@@ -1799,18 +1809,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 //    model.F_State2 = (int)EnumWorkOrderState.finish;
                 //    model.F_Flag = 1;
                 //}
-                model.F_Flag = 9;
-                var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl,3,9);
-                //if (nextda2 != 0)
-                //{
-                //    model.F_Flag = 3;
-                //    var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 2);
-                //}
-                return res;
+
+                if (nextda2 != 0)
+                {
+                    model.F_Flag = 3;
+                    var res= AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 1, 3);
+                    var res2 = AssignWO(ua, model, Input[0], cont2, "", nextda2, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 2);
+                    return 2;
+                }
+                else
+                {
+                    model.F_Flag = 9;
+                    var res = AssignWO(ua, model, Input[0], cont, "", nextda, 0, model.F_limit, sms, 0, 0, 0, time.ToString(), isbl, 3, 9);
+                    return 1;
+                }
+               
             }
             else
             {
-                return false;
+                return 0;
             }
 
         }
@@ -2617,7 +2634,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     foreach (var item in itemnext2)
                                     {
-                                        if (item.F_WoState != 10)
+                                        if (item.F_WoState != 11)
                                             flag = item.F_Type;
                                     }
                                 }
@@ -5726,7 +5743,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else
                         {
 
-                            int dapt = 0, nextda = 0;
+                            int dapt = 0, nextda = 0, nextda2=0;
                             var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                             string deptneme = "";
                             if (deptmodel1 != null)
@@ -5735,7 +5752,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 deptneme = deptmodel1.F_DeptName;
                             }
                             AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
-                            string opt = "";
+                            string opt = "",opt2="";
 
                             //if (dapt != 0)
                             //{
@@ -5770,8 +5787,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 nextda = 422;
                                 opt = "流转营销中心市场科";
-                                //nextda = 295;
-                                //opt = "流转新乡黑科质检";
+                                nextda2 = 295;
+                                opt2 = "流转新乡黑科质检";
                             }
                             else if (CirculMarket(ua.F_DeptId, 332))
                             {
@@ -5788,14 +5805,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //}
                             if (nextda != 0)
                             {
-                                modlelist.F_Flag = 9;
-                                modlelist.F_State = 1;
-                                modlelist.F_State2 = 0;
-                                var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1,3,9);
-                                if (res)
-                                    return Success("添加成功");
+                                if (nextda2 != 0)
+                                {
+                                    modlelist.F_Flag = 3;
+                                    AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1, 1, 3);
+                                    var res2 = AssignWO(ua, modlelist, input, opt2, "", nextda2, 0, 0, 0, 0, 0, 0, "", 1, 2,3);
+                                }
                                 else
-                                    return Error("流转失败！");
+                                {
+                                    modlelist.F_Flag = 9;
+                                    modlelist.F_State = 1;
+                                    modlelist.F_State2 = 1;
+                                    var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1, 3, 9);
+                                }
+                                return Success("添加成功");
                             }
                             else
                             {
@@ -6051,7 +6074,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (model == null)
                     return Error("查询不到此工单！");
 
-                if (ua.F_UserCode != "8000" & ua.F_UserCode != "9000" & ua.F_UserCode != "8003" & ua.F_UserCode != "8002" & ua.F_WorkNumber!= "9000")
+                if (ua.F_UserCode != "8000" & ua.F_UserCode != "9000" & ua.F_UserCode != "8003" & ua.F_UserCode != "8002" & ua.F_WorkNumber != "9000")
                 {
 
                     if (ro != null)
@@ -6064,16 +6087,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                         }
                     }
-                    if (model.F_State == 2)
+                    if ((model.F_Type == "2" || model.F_Type == "5") && (input.F_Type == 2 || input.F_Type == 5))
                     {
-                        return Error("此工单已接单不能修改！");
                     }
-                    else if (model.F_State == 11 || model.F_State == 10)
+                    else
                     {
-                        return Error("此工单已处理不能修改！");
+                        if (model.F_State == 2)
+                        {
+                            return Error("此工单已接单不能修改！");
+                        }
+                        else if (model.F_State == 11 || model.F_State == 10)
+                        {
+                            return Error("此工单已处理不能修改！");
+                        }
                     }
                 }
 
+                if ((model.F_Type == "2" || model.F_Type == "5") && (input.F_Type == 2 || input.F_Type == 5))
+                {
+                }
+                else
+                {
+                    return Error("此工单类型不能修改！");
+                }
+
                 if (!string.IsNullOrEmpty(input.F_CustomerID))
                 {
                     var Customer = cusbll.GetModel(input.F_CustomerID.Trim());
@@ -6134,7 +6171,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                             {
                                 string deptname1 = "";
-                                int dapt = 0, nextda = 0; string opt = "";
+                                int dapt = 0, nextda = 0, nextda2 = 0; string opt = "", opt2 = "";
                                 var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
                                 if (deptmodel1 != null)
                                 {
@@ -6174,8 +6211,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     nextda = 422;
                                     opt = "流转营销中心市场科";
-                                    //nextda = 295;
-                                    //opt = "流转新乡黑科质检";
+                                    nextda2 = 295;
+                                    opt2 = "流转新乡黑科质检";
                                 }
                                 else if (CirculMarket(ua.F_DeptId, 332))
                                 {
@@ -6191,11 +6228,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //}
                                 if (nextda != 0)
                                 {
-                                    var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0, 0, 0, 0, "",1,1,9);
-                                    if (res)
-                                        return Success("保存成功");
+                                    if (nextda2 != 0)
+                                    {
+                                        model.F_Flag = 3;
+                                        AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0, 0, 0, 0, "", 1, 1, 3);
+                                        var res2 = AssignWO(ua, model, input, opt2, "", nextda2, 0, 0, 0, 0, 0, 0, "", 1, 2, 3);
+                                    }
                                     else
-                                        return Error("流转失败！");
+                                    {
+                                        model.F_State = 1;
+                                        model.F_State2 = 1;
+                                        model.F_Flag = 9;
+                                        var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0, 0, 0, 0, "", 1, 3, 9);
+                                    }
+                                    return Success("保存成功");
                                 }
                                 else
                                 {
@@ -8054,16 +8100,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             #region 工单处理
             int sms = 0;
-            int? woflag = model.F_Flag;
-            string strsql = "";
-            if (woflag == 1)
-            {
-                strsql = $" and F_Type in(1,3)";
-            }
-            else if (woflag == 2)
-            {
-                strsql = $" and F_Type in(2,3)";
-            }
+            int woflag = 0;
+            //string strsql = "";
+            //if (woflag == 1)
+            //{
+            //    strsql = $" and F_Type in(1,3)";
+            //}
+            //else if (woflag == 2)
+            //{
+            //    strsql = $" and F_Type in(2,3)";
+            //}
             var itemlasts = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and  F_WoID={model.F_ID}");
             string creatuser1 = "";
             string creatuser2 = "";
@@ -8071,11 +8117,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 foreach (var it in itemlasts)
                 {
-                    if (it.F_WoState == 10 && it.F_Type == 1 && (it.F_Flag == 1 || it.F_Flag == 3))
+                    if (it.F_WoState == 10)
                     {
                         creatuser1 = it.F_CreateUser;
+                        woflag = Convert.ToInt32(it.F_Type);
                     }
-                    if (it.F_WoState == 10 && it.F_Type==2 && (it.F_Flag == 2 || it.F_Flag == 3))
+                    if (it.F_WoState == 10 && it.F_Type==2 )
                     {
                         creatuser2 = it.F_CreateUser;
                     }
@@ -8105,7 +8152,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string smscont = "";
 
             if (deptid1 > 0)
-                AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser1, deptid1, nowUser, model.F_limit, sms, "", 0, 1);
+                AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser1, deptid1, nowUser, model.F_limit, sms, "", 0, woflag);
             if (deptid2 > 0)
                 AddLog((int)model.F_ID, 3, content, (int)EnumItemType.deal, 4, creatuser2, deptid2, nowUser, model.F_limit, sms, "", 0, 2);
             //if (itemid > 0)
@@ -8835,10 +8882,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //if (modellist.F_NextUser != ua.F_UserCode)
                                     return Error("非接单人不可操作工单");
                             }
-                            if (model.F_Flag == 9)
-                            {
-                                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;// 责任单位
@@ -8899,13 +8946,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             //}
                             #endregion
                             int? zflag = 0;
-                            if (inoutflag != 0)
+                            if (model.F_Flag == 9)
                             {
-                                zflag = inoutflag;
+                                model.F_Flag = 1;//默认外线操作
+                                zflag = 1;
+                                Overorder(ua, model, 2, 2);
                             }
                             else
                             {
-                                zflag = modellist.F_Type;
+                                if (inoutflag != 0)
+                                {
+                                    zflag = inoutflag;
+                                }
+                                else
+                                {
+                                    zflag = modellist.F_Type;
+                                }
                             }
                             var modellast = 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 (model.F_State == 10 && model.F_State2 == 10)
@@ -9903,13 +9959,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 向上一级操作人员推送消息
                 if (!string.IsNullOrWhiteSpace(touser) && touser != nowUser.F_UserCode)
                 {//排除上一级指派人是自己
-                    sendsysmsg(model, nowUser, touser, 0, opt);
-                    // var lastUser = sysUserAccountBll.GetModel(touser);
-                    //if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
-                    //    sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
+                    sendsysmsg(model, nowUser, touser, 0, opt);                 
                 }
-                //   if (!string.IsNullOrEmpty(model.F_WxOpenId))
-                //    sendwxmsg(model, model.F_WxOpenId, nowUser, model.F_DealContent );
+                
                 #endregion
                 #endregion
                 return true;