更新

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

@@ -6796,6 +6796,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         model.F_State2 = (int)EnumWorkOrderState.reassign;
                     }
+                    else
+                    {
+                        model.F_State = (int)EnumWorkOrderState.reassign;
+                        model.F_State2 = (int)EnumWorkOrderState.reassign;
+                    }
                 }
                 else
                 {
@@ -6807,6 +6812,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         model.F_State2 = wostate;
                     }
+                    else
+                    {
+                        model.F_State = wostate;
+                        model.F_State2 = wostate;
+                    }
 
                 }
                 woBLL.Update(model);

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

@@ -6087,30 +6087,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                         }
                     }
-                    if ((model.F_Type == "2" || model.F_Type == "5") && (input.F_Type == 2 || input.F_Type == 5))
+                    if (model.F_State == 2)
                     {
+                        return Error("此工单已接单不能修改！");
                     }
-                    else
+                    else if (model.F_State == 11 || model.F_State == 10)
                     {
-                        if (model.F_State == 2)
-                        {
-                            return Error("此工单已接单不能修改！");
-                        }
-                        else if (model.F_State == 11 || model.F_State == 10)
-                        {
-                            return Error("此工单已处理不能修改！");
-                        }
+                        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());
@@ -8110,14 +8096,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
             //{
             //    strsql = $" and F_Type in(2,3)";
             //}
-            var itemlasts = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and  F_WoID={model.F_ID}");
+            var itemlasts = itembll.GetModelList($"F_ItemType={(int)EnumItemType.deal} and  F_WoID={model.F_ID} and  F_WoState={(int)EnumWorkOrderState.finish}");
             string creatuser1 = "";
             string creatuser2 = "";
             if (itemlasts.Count > 0)
             {
                 foreach (var it in itemlasts)
                 {
-                    if (it.F_WoState == 10)
+                    if (it.F_WoState == 10 && (it.F_Type == 1 || it.F_Type == 3))
                     {
                         creatuser1 = it.F_CreateUser;
                         woflag = Convert.ToInt32(it.F_Type);
@@ -9570,7 +9556,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 #region 处理工单
                 if (deptid == 2)
                 {
-                    if (flag == 1 ||((model.F_Flag==null || model.F_Flag == 0) && flag==3))
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
                         model.F_State = (int)EnumWorkOrderState.reassign;
                     }
@@ -9578,6 +9564,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_State2 = (int)EnumWorkOrderState.reassign;
                     }
+                    else
+                    {
+                        model.F_State = (int)EnumWorkOrderState.reassign;
+                        model.F_State2 = (int)EnumWorkOrderState.reassign;
+                    }
                 }
                 else
                 {
@@ -9589,6 +9580,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_State2 = wostate;
                     }
+                    else
+                    {
+                        model.F_State = wostate;
+                        model.F_State2 = wostate;
+                    }
 
                 }
                 workOrder.Update(model);