chen_yjin 1 week ago
parent
commit
02338fb568

+ 1 - 1
JLHHJSvr/Com/Model/u_mattress_interface_qd.cs

@@ -18,7 +18,7 @@ namespace JLHHJSvr.Com.Model
         public int? mtrlid { get; set; }
         public int? erp_mtrlid { get; set; }
         public int? wrkgrpid { get; set; }
-        public int? wrkgrpid_new { get; set; }
+        public int? wrkgrpid2 { get; set; }
         public decimal? useqty { get; set; }
         public string dscrp { get; set; }
         public decimal? actual_useqty { get; set; }

+ 2 - 2
JLHHJSvr/Excutor/CreatMtrlPfExcutor.cs

@@ -97,7 +97,7 @@ namespace JLHHJSvr.Excutor
 	                            ,u_mattress_interface_qd.qd_actual_size 
 	                            ,u_mattress_interface_qd.qd_pfgroupqty 
 	                            ,u_mattress_interface_qd.wrkgrpid 
-	                            ,u_mattress_interface_qd.wrkgrpid_new 
+	                            ,u_mattress_interface_qd.wrkgrpid2 
 	                            ,u_mattress_interface_qd.wrkgrpcode1
 	                            ,u_mattress_interface_qd.wrkgrpcode2
 	                            ,u_mattress_interface_qd.ss_rate 
@@ -105,7 +105,7 @@ namespace JLHHJSvr.Excutor
 	                            ,u_mattress_interface_qd.sh_rate 
                             FROM u_mattress_interface_qd
                             LEFT JOIN u_mtrl_price ON u_mtrl_price.mtrlid = u_mattress_interface_qd.mtrlid";
-                var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,wrkgrpid_new,ss_rate,ls_rate,sh_rate,wrkgrpcode1,wrkgrpcode2";
+                var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,wrkgrpid2,ss_rate,ls_rate,sh_rate,wrkgrpcode1,wrkgrpcode2";
                 DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", outputFields, 0, 0, mattress_interface_qd_list);
 
 

+ 2 - 2
JLHHJSvr/Helper/InterfaceHelper.cs

@@ -178,14 +178,14 @@ namespace JLHHJSvr.Helper
 	                            ,u_mattress_interface_qd.wrkgrpid 
 	                            ,u_mattress_interface_qd.wrkgrpcode1
 	                            ,u_mattress_interface_qd.wrkgrpcode2
-	                            ,u_mattress_interface_qd.wrkgrpid_new
+	                            ,u_mattress_interface_qd.wrkgrpid2
 	                            ,u_mattress_interface_qd.ss_rate 
 	                            ,u_mattress_interface_qd.ls_rate 
 	                            ,u_mattress_interface_qd.sh_rate 
 	                            ,u_mattress_interface_qd.formulaid 
                             FROM u_mattress_interface_qd
                             LEFT JOIN u_mtrl_price ON u_mtrl_price.mtrlid = u_mattress_interface_qd.mtrlid";
-            var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,wrkgrpid_new,ss_rate,ls_rate,sh_rate,wrkgrpcode1,wrkgrpcode2";
+            var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,wrkgrpid2,ss_rate,ls_rate,sh_rate,wrkgrpcode1,wrkgrpcode2";
             DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", mattressid } }, "printid", outputFields, 0, 0, qdList);
 
             if (qdList.Count <= 0)

+ 1 - 1
JLHHJSvr/Helper/MattressHelper.cs

@@ -1997,7 +1997,7 @@ namespace JLHHJSvr.Helper
             foreach (var mx in qdlist)
             {
                 mx.mattressid = mattressid;
-                DbSqlHelper.Insert(cmd, mx, "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,wrkgrpid,wrkgrpid_new,useqty,dscrp,actual_useqty,qd_actual_size,qd_pfgroupqty,ss_rate,ls_rate,sh_rate,formulaid,wrkgrpcode1,wrkgrpcode2");
+                DbSqlHelper.Insert(cmd, mx, "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,wrkgrpid,wrkgrpid2,useqty,dscrp,actual_useqty,qd_actual_size,qd_pfgroupqty,ss_rate,ls_rate,sh_rate,formulaid,wrkgrpcode1,wrkgrpcode2");
             }