补充提交

JLHHJSvr/Excutor/CreatMtrlPfExcutor.cs

@@ -41,9 +41,48 @@ namespace JLHHJSvr.Excutor
                     return;
                 }
 
+                var interfaceList = new List<u_mattress_interface>();
+                var selectStr = @"SELECT u_mattress_interface.mattressid
+	                            ,printid
+	                            ,itemname
+	                            ,bj_pzname
+	                            ,bj_namemx
+	                            ,actual_size
+	                            ,sb_craft
+	                            ,actual_size_sb
+	                            ,erp_pzid
+	                            ,ss_rate
+	                            ,ls_rate
+	                            ,bj_inputtype
+                                ,u_configure_code.pzcode
+                                ,u_configure_code.name
+                            FROM u_mattress_interface
+                            left outer join u_mattress on u_mattress.mattressid = u_mattress_interface.mattressid
+                            left outer join u_configure_code on u_configure_code.typeid = u_mattress.erp_configcodetype 
+		                            and u_mattress_interface.erp_pzid = u_configure_code.pzid";
+                DbSqlHelper.SelectJoin(cmd, selectStr, "u_mattress_interface.mattressid = @mattressid AND u_mattress_interface.erp_pzid > 0 AND u_mattress_interface.bj_pzname <> '' ", new Dictionary<string, object>() { { "@mattressid", mattress.mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype", 0, 0, interfaceList);
+
+
+                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
+                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
+
+                l1Helper.CheckLogin();
+
+                if (mattress.erp_mtrlid <= 0)
+                {
+                    mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
+
+                    var errMsg = l1Helper.SaveMtrldef(mattress);
+                    if (!string.IsNullOrEmpty(errMsg))
+                    {
+                        rslt.ErrMsg = errMsg;
+                        return;
+                    }
+                }
+
                 var mattress_interface_qd_list = new List<u_mattress_interface_qd>();
 
-                var selectStr = @"SELECT u_mattress_interface_qd.mattressid 
+                selectStr = @"SELECT u_mattress_interface_qd.mattressid 
 	                            ,u_mattress_interface_qd.printid 
 	                            ,u_mattress_interface_qd.itemname 
 	                            ,u_mattress_interface_qd.bj_pzname 
@@ -66,22 +105,6 @@ namespace JLHHJSvr.Excutor
                 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,ss_rate,ls_rate,sh_rate";
                 DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", outputFields, 0, 0, mattress_interface_qd_list);
 
-                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
-                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
-
-                l1Helper.CheckLogin();
-
-                if (mattress.erp_mtrlid <= 0)
-                {
-                    mattress = GetMattressMsg(mattress, mattress_interface_qd_list);
-
-                    var errMsg = l1Helper.SaveMtrldef(mattress);
-                    if (!string.IsNullOrEmpty(errMsg))
-                    {
-                        rslt.ErrMsg = errMsg;
-                        return;
-                    }
-                }
 
                 var ll_temp_dftwrkgrpid = 0;
 

JLHHJSvr/Excutor/UpdateMtrlPriceExcutor.cs

@@ -42,17 +42,35 @@ namespace JLHHJSvr.Excutor
                     return;
                 }
 
+                var interfaceList = new List<u_mattress_interface>();
+                var selectStr = @"SELECT u_mattress_interface.mattressid
+	                            ,printid
+	                            ,itemname
+	                            ,bj_pzname
+	                            ,bj_namemx
+	                            ,actual_size
+	                            ,sb_craft
+	                            ,actual_size_sb
+	                            ,erp_pzid
+	                            ,ss_rate
+	                            ,ls_rate
+	                            ,bj_inputtype
+                                ,u_configure_code.pzcode
+                                ,u_configure_code.name
+                            FROM u_mattress_interface
+                            left outer join u_mattress on u_mattress.mattressid = u_mattress_interface.mattressid
+                            left outer join u_configure_code on u_configure_code.typeid = u_mattress.erp_configcodetype 
+		                            and u_mattress_interface.erp_pzid = u_configure_code.pzid";
+                DbSqlHelper.SelectJoin(cmd, selectStr, "u_mattress_interface.mattressid = @mattressid AND u_mattress_interface.erp_pzid > 0 AND u_mattress_interface.bj_pzname <> '' ", new Dictionary<string, object>() { { "@mattressid", mattress.mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype", 0, 0, interfaceList);
+
                 var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
                 l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
 
                 l1Helper.CheckLogin();
 
-                var lde_dijia_cost = mattress.nottax_factory_cost / (mattress.dept_profitrate + mattress.dept_profitrate_rangli / 100);
-                var lde_commission = lde_dijia_cost / (1 - (mattress.commission - 1)) - lde_dijia_cost;
-                var ls_bj_mxdscrp = "底价：" + lde_dijia_cost.Value.ToString("###0.00") + ",  佣金：" + lde_commission.Value.ToString("###0.00") + ",  税金：" + mattress.taxes.Value.ToString("###0.00") + ",  fob：" + mattress.fob.Value.ToString("###0.00") + ",  最后更新日期：" + DateTime.Today.ToString("yyyy-MM-dd") + "," + mattress.nottax_factory_cost.Value.ToString("###0.00");
-                mattress.bj_mxdscrp = ls_bj_mxdscrp;
+                mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
 
-                var errMsg = l1Helper.SaveMtrldef(mattress, "bj_mxdscrp");
+                var errMsg = l1Helper.SaveMtrldef(mattress, "bj_mxdscrp,configname");
                 if (!string.IsNullOrEmpty(errMsg))
                 {
                     rslt.ErrMsg = errMsg;

JLHHJSvr/Helper/ERPHelper.cs

@@ -176,7 +176,7 @@ namespace JLHHJSvr.Helper
         /// 更新床垫相关选项
         /// </summary>
         /// <param name="mattress"></param>
-        public u_mattress GetMattressMsg(u_mattress mattress, List<u_mattress_interface_qd> qdList)
+        public u_mattress GetMattressMsg(u_mattress mattress, List<u_mattress_interface> interfaceList)
         {
             var errMsg = string.Empty;
 
@@ -186,6 +186,22 @@ namespace JLHHJSvr.Helper
             mattress.bj_mxdscrp = ls_bj_mxdscrp;
             mattress.dijia_cost = lde_dijia_cost;
 
+            string ls_configcode = "", ls_configname = "";
+            foreach (var item in interfaceList)
+            {
+                string ls_temp_pzcode = item.pzcode;
+                string ls_temp_str, ls_temp_pzname = "", ls_temp_pznamemx;
+
+                ls_temp_str = item.actual_size + item.sb_craft + item.actual_size_sb;
+                ls_temp_pznamemx = string.IsNullOrEmpty(ls_temp_str) ? item.bj_namemx : item.bj_namemx + "@@" + ls_temp_str + "@@" + item.ss_rate.Value.ToString("###0.00") + "@@" + item.ls_rate.Value.ToString("###0.00");
+
+                ls_configcode = ls_configcode + ls_temp_pznamemx + "|";
+                ls_configname = ls_configname + ls_temp_pzname + ":" + ls_temp_pznamemx + "|";
+            }
+
+            mattress.configcode = ls_configcode;
+            mattress.configname = ls_configname;
+
             return mattress;
         }