完善床垫清单更新信息

JLHHJSvr/Com/Model/u_mattress.cs

@@ -170,6 +170,8 @@ namespace JLHHJSvr.Com.Model
         public int? mtrltypeid { get; set; }
         public string bj_mxdscrp { get; set; }
         public decimal? dijia_cost { get; set; }
+        public string configcode { get; set; }
+        public string configname { get; set; }
         #endregion
     }
 }

JLHHJSvr/Com/Model/u_mattress_interface.cs

@@ -23,5 +23,7 @@ namespace JLHHJSvr.Com.Model
         public string erp_pzname { get; set; }
         public decimal? ss_rate { get; set; }
         public decimal? ls_rate { get; set; }
+        public string pzcode { get; set; }
+        public string pzname { get; set; }
     }
 }

JLHHJSvr/Excutor/CreatMtrlPfExcutor.cs

@@ -41,27 +41,6 @@ namespace JLHHJSvr.Excutor
                     return;
                 }
 
-                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
-                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
-
-                l1Helper.CheckLogin();
-
-                if (mattress.erp_mtrlid <= 0)
-                {
-                    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.dijia_cost = lde_dijia_cost;
-
-                    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 
@@ -87,6 +66,22 @@ 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/Helper/ERPHelper.cs

@@ -129,7 +129,7 @@ namespace JLHHJSvr.Helper
         /// </summary>
         /// <param name="mtrl">核价物料资料</param>
         /// <returns>错误信息</returns>
-        public string SaveMtrldef(u_mattress mtrl, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname")
+        public string SaveMtrldef(u_mattress mtrl, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configname")
         {
             var errMsg = string.Empty;
 
@@ -154,7 +154,8 @@ namespace JLHHJSvr.Helper
                         ["taxes"] = mtrl.taxes, // 税金
                         ["extras_cost"] = mtrl.extras_cost, // 额外费用
                         ["planprice"] = mtrl.nottax_factory_cost, // 计划价
-                        ["bj_mxdscrp"] = mtrl.bj_mxdscrp
+                        ["bj_mxdscrp"] = mtrl.bj_mxdscrp,
+                        ["configname"] = mtrl.configname
                     }
                 },
                 ["updateFields"] = fields
@@ -171,6 +172,23 @@ namespace JLHHJSvr.Helper
             return errMsg;
         }
 
+        /// <summary>
+        /// 更新床垫相关选项
+        /// </summary>
+        /// <param name="mattress"></param>
+        public u_mattress GetMattressMsg(u_mattress mattress, List<u_mattress_interface_qd> qdList)
+        {
+            var errMsg = string.Empty;
+
+            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.dijia_cost = lde_dijia_cost;
+
+            return mattress;
+        }
+
         /// <summary>
         /// 更新L1计划价 wf_updateL1_planprice
         /// </summary>