1

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -9641,6 +9641,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
                 var deptlist = new BLL.T_Sys_Department().GetModelList("F_DeptId in (" + maindeptid + ")");
                 string newids = ""; string errdeptid = ""; string deptname = "";
+                int son = 0; string whorkorderid = tempT_Bus_WorkOrder.F_WorkOrderId;
+                if (tempT_Bus_WorkOrder.F_WorkOrderId.Contains ("-"))
+                {
+                    try
+                    {
+                       
+                        whorkorderid = tempT_Bus_WorkOrder.F_WorkOrderId.Split('-')[0];
+                        var workoder = new BLL.T_Bus_WorkOrder().GetModelList($"F_WorkOrderId like '{whorkorderid}%' " +
+                            $"order by F_Id desc ");
+                        if (workoder!=null && workoder.Count >0)
+                        {
+                            son = int.Parse(workoder.FirstOrDefault ().F_WorkOrderId.Split('-')[1]);
+                        }
+                    }
+                    catch
+                    {
+                        son = 0;
+                    }
+                }
                 if (modelT_Bus_WorkOrder != null && deptlist != null && deptlist.Count > 0)
                 {
                     if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealing|| modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.receive || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.visit)
@@ -9650,14 +9669,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             if (deptlist.Count == 1)
                             {
-                                
+                                son++;
                                 var deptinfo = deptlist.FirstOrDefault();
                                 deptname = deptinfo.F_DeptName;
                                 #region 新增工单
                                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
                                 modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
                                 modelT_Bus_WorkOrder1.F_LimitTime = limittime;
-                                modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(modelT_Bus_WorkOrder.F_CreateUser);
+                                modelT_Bus_WorkOrder1.F_WorkOrderId = whorkorderid+"-"+ son;
                                 modelT_Bus_WorkOrder1.F_MainWorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
                                 modelT_Bus_WorkOrder1.F_Files = "";
                                 modelT_Bus_WorkOrder1.F_Id = workorderBLL.Add(modelT_Bus_WorkOrder1);
@@ -9749,11 +9768,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                                 foreach (var deptinfo in deptlist)
                                 {
+                                    son++;
                                     //deptname += deptinfo.F_DeptName + ",";
                                     #region 新增工单
                                     Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
                                     modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
-                                    modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(modelT_Bus_WorkOrder.F_CreateUser);
+                                    modelT_Bus_WorkOrder1.F_WorkOrderId = whorkorderid+"-"+son ;
                                     modelT_Bus_WorkOrder1.F_MainWorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
                                     modelT_Bus_WorkOrder1.F_Id = workorderBLL.Add(modelT_Bus_WorkOrder1);
                                     if (modelT_Bus_WorkOrder1.F_Id <= 0)