更新分支

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrder.cs

@@ -172,7 +172,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_WorkmanShip", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Manufacturers", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_ProductionNum", SqlDbType.Int,4),
-                    new SqlParameter("@F_SuperiorOpinion", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_SuperiorOpinion", SqlDbType.NText),
                     new SqlParameter("@F_DrivePhone", SqlDbType.VarChar,20),
                     new SqlParameter("@F_SuperiorOpinion2", SqlDbType.NText),
                     new SqlParameter("@F_EventReason2", SqlDbType.NVarChar,200),
@@ -558,7 +558,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_WorkmanShip", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_Manufacturers", SqlDbType.NVarChar,50),
                     new SqlParameter("@F_ProductionNum", SqlDbType.Int,4),
-                    new SqlParameter("@F_SuperiorOpinion", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_SuperiorOpinion", SqlDbType.NText),
                     new SqlParameter("@F_DrivePhone", SqlDbType.VarChar,20),
                     new SqlParameter("@F_SuperiorOpinion2", SqlDbType.NText),
                     new SqlParameter("@F_EventReason2", SqlDbType.NVarChar,200),

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

@@ -8123,48 +8123,64 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                     if (modlelist != null)
                     {
-                        if (flag == 3)
-                        {
-                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,0,0,0,"",0,1,flag);
-                            var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
-                        }
-                        else if (flag == 2)
+                        #region 咨询、建议、抽检类工单变更为单线流转
+                        if (modlelist.F_Type == "1" || modlelist.F_Type == "3" || modlelist.F_Type == "4")
                         {
 
-                            if (clbm2 == 427) //运营中心
+                            if (clbm == 0 && clid == 0)
                             {
-                                flag = 3;
-                                modlelist.F_Flag = 9;
-                                modlelist.F_State = (int)EnumWorkOrderState.assign;
-                                modlelist.F_State2 = (int)EnumWorkOrderState.assign;
-                                AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 3,9);
-                            }
-                            else
-                            {
-                                var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2, flag);
-                                Overorder(ua, modlelist, 2,1);
-                            }
-
-                            //DealWO(ua, modlelist, input, "", "", 1, "", 1, "",flag);
+                                return Error("请选择接收部门");
+                            }                 
+                            modlelist.F_Flag = 1;
+                            Overorder(ua, modlelist, 2, 2);
+                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,0,0,0,"",0,1,1);
                         }
+                        #endregion
                         else
                         {
-                            if (clbm == 427) //运营中心
+                            if (flag == 3)
                             {
-                                flag = 3;
-                                modlelist.F_Flag = 9;
-                                modlelist.F_State = (int)EnumWorkOrderState.assign;
-                                modlelist.F_State2 = (int)EnumWorkOrderState.assign;
-                                AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                                var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 1, flag);
+                                var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2, flag);
                             }
-                            else
+                            else if (flag == 2)
                             {
-                                var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms, flag);
-                                Overorder(ua, modlelist, 2, 2);
+
+                                if (clbm2 == 427) //运营中心
+                                {
+                                    flag = 3;
+                                    modlelist.F_Flag = 9;
+                                    modlelist.F_State = (int)EnumWorkOrderState.assign;
+                                    modlelist.F_State2 = (int)EnumWorkOrderState.assign;
+                                    AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                                }
+                                else
+                                {
+                                    var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2, flag);
+                                    Overorder(ua, modlelist, 2, 1);
+                                }
+
+                                //DealWO(ua, modlelist, input, "", "", 1, "", 1, "",flag);
                             }
-                           
-                            //DealWO(ua, modlelist, input, "", "", 1, "", 2, "",flag);
+                            else
+                            {
+                                if (clbm == 427) //运营中心
+                                {
+                                    flag = 3;
+                                    modlelist.F_Flag = 9;
+                                    modlelist.F_State = (int)EnumWorkOrderState.assign;
+                                    modlelist.F_State2 = (int)EnumWorkOrderState.assign;
+                                    AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                                }
+                                else
+                                {
+                                    var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms);
+                                    Overorder(ua, modlelist, 2, 2);
+                                }
+
+                                //DealWO(ua, modlelist, input, "", "", 1, "", 2, "",flag);
 
+                            }
                         }
                         return Success("转派成功");
                     }
@@ -8701,101 +8717,117 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     var modellast = 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 ").FirstOrDefault();
                     model.F_Flag = flag;
-                    if (flag == 3)
+                    #region 咨询、建议、抽检类工单变更为单线流转
+                    if (model.F_Type == "1" || model.F_Type == "3" || model.F_Type == "4")
                     {
-                        if ((clbm == 0 && clid == 0) || (clbm2 == 0 && clid2 == 0))
+
+                        if (clbm == 0 && clid == 0)
                         {
                             return Error("请选择接收部门");
-
                         }
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag,Supercont);
-                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
-
+                        Overorder(ua, model, 2, 2);
+                        model.F_Flag = 1;
+                        AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, 1, Supercont);
                     }
-                    else if (flag == 2)
+                    #endregion
+                    else
                     {
-                        if (clbm2 == 0 && clid2 == 0)
-                        {
-                            return Error("请选择接收部门");
-                        }
-                        if (opttype == 2) //填写处理结果
-                        {
-                            flag = 3;
-                            DealWO(ua, model, input, cont2, "", 1, "", 1, flag,isApprovalp);
-                            model.F_Flag = flag;
-                            AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
-                        }
-                        else if (opttype == 3) // 待处理状态
+                        if (flag == 3)
                         {
-                            flag = 3;
-                            modellast.F_Type = 1;
-                            modellast.F_Flag = flag;
-                            modellast.F_NextDept = 0;
-                            itembll.Update(modellast);
-                            model.F_Flag = flag;
-                            AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
+                            if ((clbm == 0 && clid == 0) || (clbm2 == 0 && clid2 == 0))
+                            {
+                                return Error("请选择接收部门");
+
+                            }
+                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
+                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
+
                         }
-                        else //完结工单
+                        else if (flag == 2)
                         {
-                            if (clbm == 427) //运营中心
+                            if (clbm2 == 0 && clid2 == 0)
+                            {
+                                return Error("请选择接收部门");
+                            }
+                            if (opttype == 2) //填写处理结果
                             {
                                 flag = 3;
-                                model.F_Flag = 9;
-                                model.F_State = (int)EnumWorkOrderState.assign;
-                                model.F_State2 = (int)EnumWorkOrderState.assign;
-                                AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                                DealWO(ua, model, input, cont2, "", 1, "", 1, flag, isApprovalp);
+                                model.F_Flag = flag;
+                                AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
                             }
-                            else
+                            else if (opttype == 3) // 待处理状态
                             {
-                                Overorder(ua, model, 2, 1);
+                                flag = 3;
+                                modellast.F_Type = 1;
+                                modellast.F_Flag = flag;
+                                modellast.F_NextDept = 0;
+                                itembll.Update(modellast);
                                 model.F_Flag = flag;
                                 AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
                             }
+                            else //完结工单
+                            {
+                                if (clbm == 427) //运营中心
+                                {
+                                    flag = 3;
+                                    model.F_Flag = 9;
+                                    model.F_State = (int)EnumWorkOrderState.assign;
+                                    model.F_State2 = (int)EnumWorkOrderState.assign;
+                                    AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                                }
+                                else
+                                {
+                                    Overorder(ua, model, 2, 1);
+                                    model.F_Flag = flag;
+                                    AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag, Supercont);
+                                }
+                            }
+
+                            //DealWO(ua, model, input, "", "", 1, "", 1, "",flag);
                         }
-                       
-                        //DealWO(ua, model, input, "", "", 1, "", 1, "",flag);
-                    }
-                    else
-                    {
-                        if (clbm == 0 && clid == 0)
-                        {
-                            return Error("请选择接收部门");
-                        }
-                        if (opttype == 2) //填写处理结果
-                        {
-                            flag = 3;
-                            DealWO(ua, model, input, cont2, "", 1, "", 2, flag, isApprovalp);
-                            model.F_Flag = flag;
-                            AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
-                        }
-                        else if (opttype == 3) // 待处理状态
-                        {
-                            flag = 3;                         
-                            modellast.F_Type = 2;
-                            modellast.F_Flag = flag;
-                            modellast.F_NextDept = 0;
-                            itembll.Update(modellast);
-                            model.F_Flag = flag;
-                            AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
-                        }
-                        else //完结工单
+                        else
                         {
-                            if (clbm == 427) //运营中心
+                            if (clbm == 0 && clid == 0)
+                            {
+                                return Error("请选择接收部门");
+                            }
+                            if (opttype == 2) //填写处理结果
                             {
                                 flag = 3;
-                                model.F_Flag = 9;
-                                model.F_State = (int)EnumWorkOrderState.assign;
-                                model.F_State2 = (int)EnumWorkOrderState.assign;
-                                AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                                DealWO(ua, model, input, cont2, "", 1, "", 2, flag, isApprovalp);
+                                model.F_Flag = flag;
+                                AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
                             }
-                            else
+                            else if (opttype == 3) // 待处理状态
                             {
-                                Overorder(ua, model, 2, 2);
+                                flag = 3;
+                                modellast.F_Type = 2;
+                                modellast.F_Flag = flag;
+                                modellast.F_NextDept = 0;
+                                itembll.Update(modellast);
                                 model.F_Flag = flag;
                                 AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
                             }
+                            else //完结工单
+                            {
+                                if (clbm == 427) //运营中心
+                                {
+                                    flag = 3;
+                                    model.F_Flag = 9;
+                                    model.F_State = (int)EnumWorkOrderState.assign;
+                                    model.F_State2 = (int)EnumWorkOrderState.assign;
+                                    AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, 0, 0, 0, "", 0, 3, 9);
+                                }
+                                else
+                                {
+                                    Overorder(ua, model, 2, 2);
+                                    model.F_Flag = flag;
+                                    AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
+                                }
+                            }
+
                         }
-                                                    
                     }
                     return Success("转派成功");
                 }
@@ -10158,7 +10190,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 model.F_VisitReason = reason;
                 model.F_Callresults = call;
                 model.F_Sid = sid;
-                model.F_VisitRemarks = F_VisitRemarks;
+                if (!string.IsNullOrEmpty(F_VisitRemarks))
+                {
+                    model.F_VisitRemarks = F_VisitRemarks;
+                }
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息