5

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

@@ -7502,6 +7502,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 || userModel.F_RoleCode == "DFZF" || userModel.F_RoleCode == "WLDW") //增加新闻媒体(编号11)的添加工单权限 
             {
 
+                string workorderid = RequestString.GetFormString("workorderid"); //工单编号
+                int  id = RequestString.GetInt("id", 0); //编号
+
 
                 string title = RequestString.GetFormString("title"); //题目
                 string cusname = RequestString.GetFormString("cusname");//作者
@@ -7556,7 +7559,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     #region 保存工单信息
                     Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = new Model.T_Bus_WorkOrder();
-                    modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(userModel.F_UserCode);
+                  
+
+                    if(!string .IsNullOrEmpty (workorderid))
+                    {
+                        if (id <= 0)
+                            return Error("请输入正确编号");
+                            var istrue = new BLL.T_Bus_WorkOrder().Exists(workorderid);
+                        if (istrue)
+                            return Error("工单编号重复");
+                          modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(DbHelperSQL.GetSingle($"exec [GetNewWorkOrderIdByYear1] '{id}'").ToString());
+
+                    }
+                    else
+                    {
+                        modelT_Bus_WorkOrder.F_WorkOrderId = workorderBLL.GetNewWorkOrderID(userModel.F_UserCode);
+                    }
+
+
+                   
 
                     modelT_Bus_WorkOrder.F_ComTitle = title;//题目
                     modelT_Bus_WorkOrder.F_CusName = cusname;//作者
@@ -9284,7 +9305,22 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string maindeptid = RequestString.GetFormString("maindeptid");
                 string otherdeptids = RequestString.GetFormString("otherdeptids");
                 DateTime limittime = DateTime.Parse(RequestString.GetFormString("limittime") );
-                string assignedopinion = RequestString.GetFormString("assignedopinion");
+                string assignedopinion = RequestString.GetFormString("assignedopinion");//提示信息
+
+
+
+               
+                string cusaddress = RequestString.GetFormString("cusaddress");//主要网址F_CusAddress
+
+
+                string title = RequestString.GetFormString("title");//题目F_ComTitle
+
+
+                string keys = RequestString.GetFormString("keys");//内容简介F_Key
+
+
+
+
 
                 var modelT_Bus_AssignedInfoLasts = assignBLL.GetList(0, $" F_WorkOrderId='{workorderid}' and F_IsDelete='0' and  F_State='1' ", " F_CreateTime desc").Tables[0];
                 if (modelT_Bus_AssignedInfoLasts.Rows.Count > 0)
@@ -9377,6 +9413,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     modelT_Bus_WorkOrder.F_OtherDeptIds = otherdeptids;
                                     modelT_Bus_WorkOrder.F_AssignUser = userModel.F_UserCode;
                                     modelT_Bus_WorkOrder.F_AssignTime = DateTime.Now;
+                                    if (!string .IsNullOrEmpty (cusaddress))
+                                        modelT_Bus_WorkOrder.F_CusAddress = cusaddress;
+                                    if (!string.IsNullOrEmpty(title))
+                                        modelT_Bus_WorkOrder.F_ComTitle = title;
+                                    if (!string.IsNullOrEmpty(keys))
+                                        modelT_Bus_WorkOrder.F_Key = keys;
+
                                     workorderBLL.Update(modelT_Bus_WorkOrder);
                                     #endregion
 
@@ -9437,13 +9480,21 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     deptname += deptmasinfo.F_DeptName + ",";
                                 }
                                 int son = 0; string whorkorderid = tempT_Bus_WorkOrder.F_WorkOrderId;
-                                    foreach (var deptinfo in deptlist)
+
+                               
+                                foreach (var deptinfo in deptlist)
                                     {
                                     son++;
                                         #region 新增工单
                                     Model.T_Bus_WorkOrder modelT_Bus_WorkOrder1 = new Model.T_Bus_WorkOrder();
                                         modelT_Bus_WorkOrder1 = tempT_Bus_WorkOrder;
-                                        modelT_Bus_WorkOrder1.F_WorkOrderId = whorkorderid +"-"+ son;
+                                    if (!string.IsNullOrEmpty(cusaddress))
+                                        modelT_Bus_WorkOrder1.F_CusAddress = cusaddress;
+                                    if (!string.IsNullOrEmpty(title))
+                                        modelT_Bus_WorkOrder1.F_ComTitle = title;
+                                    if (!string.IsNullOrEmpty(keys))
+                                        modelT_Bus_WorkOrder1.F_Key = keys;
+                                    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)
@@ -9622,6 +9673,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 string otherdeptids = RequestString.GetFormString("otherdeptids");
                 DateTime limittime = DateTime.Parse(RequestString.GetFormString("limittime"));
                 string assignedopinion = RequestString.GetFormString("assignedopinion");
+
+
+                string cusaddress = RequestString.GetFormString("cusaddress");//主要网址F_CusAddress
+
+
+                string title = RequestString.GetFormString("title");//题目F_ComTitle
+
+
+                string keys = RequestString.GetFormString("keys");//内容简介F_Key
+
+
                 if (!string.IsNullOrEmpty(otherdeptids))
                 {
                     var both = otherdeptids.Split(',').Intersect(maindeptid.Split(','));
@@ -9679,6 +9741,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 modelT_Bus_WorkOrder1.F_WorkOrderId = whorkorderid+"-"+ son;
                                 modelT_Bus_WorkOrder1.F_MainWorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
                                 modelT_Bus_WorkOrder1.F_Files = "";
+                                if (!string.IsNullOrEmpty(cusaddress))
+                                    modelT_Bus_WorkOrder1.F_CusAddress = cusaddress;
+                                if (!string.IsNullOrEmpty(title))
+                                    modelT_Bus_WorkOrder1.F_ComTitle = title;
+                                if (!string.IsNullOrEmpty(keys))
+                                    modelT_Bus_WorkOrder1.F_Key = keys;
+
                                 modelT_Bus_WorkOrder1.F_Id = workorderBLL.Add(modelT_Bus_WorkOrder1);
                                
                                 #endregion
@@ -15188,6 +15257,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             modelT_Bus_WorkOrder.F_IsDelete = 1;
                             modelT_Bus_WorkOrder.F_DeleteUser= userModel.F_UserCode;
                             modelT_Bus_WorkOrder.F_DeleteTime = DateTime.Now;
+
+
+                            var str = modelT_Bus_WorkOrder.F_WorkOrderId.Split('】');
+                            if (str != null && str.Length > 0)
+                                modelT_Bus_WorkOrder.F_WorkOrderId = $"【{str[1]}-作废-{DateTime.Now.ToString("yyyyMMdd")}】";
+
+
                             workorderBLL.Update(modelT_Bus_WorkOrder);
                             #endregion