分支

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

@@ -4045,6 +4045,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_Manufacturers = model1[i].F_Manufacturers;//质量管理科-原料及厂家
                     model.F_ProductionNum = model1[i].F_ProductionNum;//质量管理科-该批次生产数量
                     model.F_Flag = model1[i].F_Flag;//1单线外 2单线内 3双线 9市场科可以双线指派工单 0 未指派工单
+
+                    if (!string.IsNullOrEmpty(model1[i].F_Material_CreateBy))
+                    {
+                        model.F_Material_CreateBy = userAccountBLL.GetModel(model1[i].F_Material_CreateBy).F_UserName;
+                        model.F_Material_CreateTime = model1[i].F_Material_CreateTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "";
+                    }
+
                     if (ua != null)
                     {
                         model.inout = GetNodeState(model1[i].F_ID, ua.F_UserCode, state);
@@ -5613,6 +5620,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                                         itemlist.Add(itemodel);
                                                     }
                                                     model.MaterialItems = itemlist;
+                                                    model.F_SC_PreliminaryOpinion = "退换货";
+                                                    model.F_Material_CreateBy = ua.F_UserCode;
+                                                    model.F_Material_CreateTime = DateTime.Now;
                                                 }
 
                                             }

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

@@ -7035,8 +7035,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_Flag = model1[i].F_Flag;//1单线外 2单线内 3双线 9市场科可以双线指派工单 0 未指派工单
                     model.inout = GetNodeState(model1[i].F_ID,state);
                     model.woflag = IsMarketAssign(model1[i].F_ID);
-
-
+                    
+                    if (!string.IsNullOrEmpty(model1[i].F_Material_CreateBy))
+                    {
+                        model.F_Material_CreateBy = sysUserAccountBll.GetModel(model1[i].F_Material_CreateBy).F_UserName;
+                        model.F_Material_CreateTime = model1[i].F_Material_CreateTime?.ToString("yyyy-MM-dd HH:mm:ss") ?? "";
+                    }                  
 
                     if (ua != null)
                     {
@@ -8028,6 +8032,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                 itemlist.Add(itemodel);
                                             }
                                             modlelist.MaterialItems = itemlist;
+                                            model.F_SC_PreliminaryOpinion = "退换货";
+                                            model.F_Material_CreateBy = ua.F_UserCode;
+                                            model.F_Material_CreateTime = DateTime.Now;
                                         }
 
                                     }
@@ -8093,14 +8100,39 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         else if (flag == 2)
                         {
-                            var res1 = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm2, clid2, overtime, sms, 0, 0, 0, "", 0, 2,flag);
-                            Overorder(ua, modlelist, 2,1);
+
+                            if (clbm2 == 427) //运营中心
+                            {
+                                flag = 3;
+                                model.F_Flag = 9;
+                                model.F_State = (int)EnumWorkOrderState.assign;
+                                model.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);
                         }
                         else
                         {
-                            var res = AssignWO(ua, modlelist, inputs, cont, F_Files, clbm, clid, overtime, sms,flag);
-                            Overorder(ua, modlelist,2,2);
+                            if (clbm == 427) //运营中心
+                            {
+                                flag = 3;
+                                model.F_Flag = 9;
+                                model.F_State = (int)EnumWorkOrderState.assign;
+                                model.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, flag);
+                                Overorder(ua, modlelist, 2, 2);
+                            }
+                           
                             //DealWO(ua, modlelist, input, "", "", 1, "", 2, "",flag);
 
                         }
@@ -8662,6 +8694,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             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) // 待处理状态
                         {
@@ -8670,13 +8704,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             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 //完结工单
                         {
-                           Overorder(ua, model, 2, 1);
+                            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);
+                            }
                         }
-                        model.F_Flag = flag;
-                        var res1 = 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);
                     }
                     else
@@ -8689,6 +8737,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             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) // 待处理状态
                         {
@@ -8697,13 +8747,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             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 //完结工单
                         {
-                            Overorder(ua, model, 2, 2);
+                            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);
+                            }
                         }
-                        model.F_Flag = flag;
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag,Supercont);                               
+                                                    
                     }
                     return Success("转派成功");
                 }
@@ -8818,6 +8882,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                                     itemlist.Add(itemodel);
                                                 }
                                                 model.MaterialItems = itemlist;
+                                                model.F_SC_PreliminaryOpinion = "退换货";
+                                                model.F_Material_CreateBy = ua.F_UserCode;
+                                                model.F_Material_CreateTime = DateTime.Now;
                                             }
 
                                         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -1013,6 +1013,9 @@ namespace CallCenterApi.Interface.Models.Input
         
         public int? inout { get; set; }
         public int? woflag { get; set; }
+        public string F_Material_CreateBy { get; set; }
+        public string F_Material_CreateTime { get; set; }
+       
 
         #region 多物料
         public List<T_Wo_MaterialItems> MaterialItems { get; set; }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -127,6 +127,10 @@ namespace CallCenterApi.Model
         private string _f_workmanship;
         private string _f_manufacturers;
         private int? _f_productionnum;
+        private int? _f_cj_isqualified = 0;
+        private int? _f_test_isqualified = 0;
+        private string _f_material_createby;
+        private DateTime? _f_material_createtime;
         public string F_Annotation
         {
             set { _f_annotation = value; }
@@ -1061,6 +1065,40 @@ namespace CallCenterApi.Model
         /// </summary>
         public int? F_Flag { get; set; }
 
+
+        /// <summary>
+		/// 
+		/// </summary>
+		public int? F_CJ_IsQualified
+        {
+            set { _f_cj_isqualified = value; }
+            get { return _f_cj_isqualified; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_Test_IsQualified
+        {
+            set { _f_test_isqualified = value; }
+            get { return _f_test_isqualified; }
+        }
+        /// <summary>
+        /// 退换货填写人
+        /// </summary>
+        public string F_Material_CreateBy
+        {
+            set { _f_material_createby = value; }
+            get { return _f_material_createby; }
+        }
+        /// <summary>
+        /// 退换货填写时间
+        /// </summary>
+        public DateTime? F_Material_CreateTime
+        {
+            set { _f_material_createtime = value; }
+            get { return _f_material_createtime; }
+        }
+
         #endregion Model
 
         #region 多物料