duhongyu преди 4 години
родител
ревизия
1b9ace1d83
променени са 1 файла, в които са добавени 13 реда и са изтрити 10 реда
  1. 13 10
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

+ 13 - 10
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -10154,7 +10154,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
10154 10154
                         oper.F_File = modelT_Bus_WorkOrder.F_File;
10155 10155
 
10156 10156
                         string userinfo = User.depname + "(" + User.F_UserCode + ")";
10157
-                        if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.neworder || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.audit)//0)
10157
+                        if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.neworder || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.audit || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealing || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.receive )//0)
10158 10158
                         {
10159 10159
                             oper.F_Message = userinfo + " 修改了工单";
10160 10160
                         }
@@ -10768,8 +10768,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
10768 10768
 
10769 10769
                 string userinfo = User.depname + "(" + User.F_UserCode + ")";
10770 10770
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
10771
-
10772
-                Model.T_Bus_WorkOrder tempT_Bus_WorkOrder = modelT_Bus_WorkOrder;
10773 10771
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = new Model.T_Bus_AssignedInfo();
10774 10772
                 var deptlist = new BLL.T_Sys_Department().GetModelList("F_DeptId in (" + maindeptid + ")");
10775 10773
                 if (modelT_Bus_WorkOrder != null && deptlist != null && deptlist.Count > 0)
@@ -10783,7 +10781,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
10783 10781
                             deptname += deptinfo.F_DeptName + ",";
10784 10782
                             #region 新增工单
10785 10783
                             Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
10786
-                            modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
10784
+                            modelT_Bus_WorkOrder1 = modelT_Bus_WorkOrder;
10787 10785
                             string creattime = ((DateTime)modelT_Bus_WorkOrder1.F_CreateTime).ToString("yyyy-MM-dd") + " 00:00:00";
10788 10786
                             string endtime = ((DateTime)modelT_Bus_WorkOrder1.F_CreateTime).ToString("yyyy-MM-dd") + " 23:59:59";
10789 10787
                             modelT_Bus_WorkOrder1.F_WorkOrderId = workorderBLL.GetNewWorkOrderID((int)modelT_Bus_WorkOrder.F_InfoSource, (int)modelT_Bus_WorkOrder.F_SourceArea, creattime, endtime);
@@ -10794,8 +10792,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
10794 10792
                                 errdeptid += deptinfo.F_DeptName + ",";
10795 10793
                                 continue;
10796 10794
                             }
10797
-                            modelT_Bus_WorkOrder.F_SubWorkorder1 = modelT_Bus_WorkOrder1.F_WorkOrderId;
10798
-                            new BLL.T_Bus_WorkOrder().Update(modelT_Bus_WorkOrder);
10795
+                         
10799 10796
                             #endregion
10800 10797
                             #region 交办
10801 10798
                             #region 插入交办记录
@@ -10857,7 +10854,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
10857 10854
                                 modelT_Bus_WorkOrder1.F_OtherDeptIds = otherdeptids;
10858 10855
                                 modelT_Bus_WorkOrder1.F_AssignUser = User.F_UserCode;
10859 10856
                                 modelT_Bus_WorkOrder1.F_AssignTime = DateTime.Now;
10860
-                                workorderBLL.Update(modelT_Bus_WorkOrder1);
10857
+                                workorderBLL.Update  (modelT_Bus_WorkOrder1);
10858
+
10859
+                              
10861 10860
                                 #endregion
10862 10861
                                 #region 删除草稿信息
10863 10862
                                 var cglist = assignBLL.GetModelList(" F_IsDelete=0 and F_State=0 and F_WorkOrderId='" + modelT_Bus_WorkOrder1.F_WorkOrderId + "'");
@@ -10894,19 +10893,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
10894 10893
                         }
10895 10894
                         newids = newids.Trim(','); deptname = deptname.Trim(',');
10896 10895
                         var msgs = "";
10896
+                        Model.T_Bus_WorkOrder tempT_Bus_WorkOrder1 = workorderBLL.GetModel(workorderid);
10897
+                        tempT_Bus_WorkOrder1.F_SubWorkorder1 = newids;
10898
+                        workorderBLL.Update(tempT_Bus_WorkOrder1);
10897 10899
                         if (errdeptid == "")
10898 10900
                         {
10899
-                            modelT_Bus_WorkOrder.F_SubWorkorder1 = newids;
10900
-                            workorderBLL.Update(modelT_Bus_WorkOrder);
10901
+                          
10901 10902
                             msgs = userinfo + " 交办多单位生成新工单,新工单编号为:" + newids;
10903
+                            addoptlog(workorderid, 4, 0, msgs, User.F_UserCode);
10902 10904
                         }
10903 10905
                         else
10904 10906
                         {
10905 10907
                             errdeptid = errdeptid.Trim(',');
10906 10908
                             msgs = userinfo + " 交办的单位有" + deptname + ",部分操作成功,新工单编号为:" + newids + ",交办失败的部门为:" + errdeptid;
10909
+                            addoptlog(workorderid, 4, 0, msgs, User.F_UserCode);
10907 10910
                         }
10908 10911
                         #region 插入操作记录
10909
-                        addoptlog(modelT_Bus_WorkOrder.F_WorkOrderId, modelT_Bus_WorkOrder.F_WorkState, modelT_Bus_AssignedInfo.F_Id, msgs, User.F_UserCode);
10912
+                      
10910 10913
                         #endregion
10911 10914
 
10912 10915