核价后台： 1、床垫清单，生成L1物料、生成物料清单，支持批量设置

JLHHJSvr/Com/CreatMtrldef.cs

@@ -14,7 +14,7 @@ namespace JLHHJSvr.Com
             return "CreatMtrldef";
         }
         public string token { get; set; }
-        public int mattressid { get; set; }
+        public List<int> list { get; set; }
     }
 
     public sealed class CreatMtrldefResponse : LJResponse

JLHHJSvr/Com/CreatPrdPf.cs

@@ -14,7 +14,7 @@ namespace JLHHJSvr.Com
             return "CreatPrdPf";
         }
         public string token { get; set; }
-        public int mattressid { get; set; }
+        public List<int> list { get; set; }
     }
 
     public sealed class CreatPrdPfResponse : LJResponse

JLHHJSvr/Com/Model/u_bednet.cs

@@ -201,6 +201,10 @@ namespace JLHHJSvr.Com.Model
         /// </summary>
         public int? dannum_type { get; set; }
         public decimal? dannum_rate { get; set; }
+        /// <summary>
+        /// 是否属于备货
+        /// </summary>
+        public int? if_stock_up { get; set; }
         #endregion
     }
 }

JLHHJSvr/DataStore/web_bednet_define.xml

@@ -139,7 +139,8 @@
 		u_bednet.spring_mtrl_formula,
 		u_bednet.spring_weight_formula,
 		u_bednet_type.if_pocket_around,
-		u_bednet_type.if_hard_around
+		u_bednet_type.if_hard_around,
+		u_bednet.if_stock_up
 
 		From u_bednet
 		left join u_mtrl_price u_mtrl_sponge on   u_bednet.sponge_mtrlid=u_mtrl_sponge.mtrlid

JLHHJSvr/Excutor/CreatMtrldefExcutor.cs

@@ -23,7 +23,7 @@ namespace JLHHJSvr.Excutor
                 rslt.ErrMsg = "会话已经中断，请重新登录";
                 return;
             }
-            if (request.mattressid <= 0)
+            if (request.list.Count <= 0)
             {
                 rslt.ErrMsg = "床垫id参数为空!";
                 return;
@@ -34,54 +34,57 @@ namespace JLHHJSvr.Excutor
             {
                 con.Open();
 
-                var mattress = new u_mattress();
-                if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", request.mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid,erp_configcodetype") != 1)
+                foreach (var mattressid in request.list)
                 {
-                    rslt.ErrMsg = "床垫报价单匹配失败";
-                    return;
-                }
+                    var mattress = new u_mattress();
+                    if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid,erp_configcodetype") != 1)
+                    {
+                        rslt.ErrMsg = "床垫报价单匹配失败";
+                        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 AS pzname
-                            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", request.mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype,pzcode,pzname", 0, 0, interfaceList);
+                    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 AS pzname
+                                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", mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype,pzcode,pzname", 0, 0, interfaceList);
 
 
-                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
-                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
+                    var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
+                    l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
 
-                l1Helper.CheckLogin();
+                    l1Helper.CheckLogin();
 
-                mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
+                    mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
 
-                var errMsg = l1Helper.SaveMtrldef(mattress, interfaceList);
-                if (!string.IsNullOrEmpty(errMsg))
-                {
-                    rslt.ErrMsg = errMsg;
-                    return;
-                }
-                mattress.mattressid = request.mattressid;
-                mattress.creatmtrl_flag = 1;
+                    var errMsg = l1Helper.SaveMtrldef(mattress, interfaceList);
+                    if (!string.IsNullOrEmpty(errMsg))
+                    {
+                        rslt.ErrMsg = errMsg;
+                        return;
+                    }
+                    mattress.mattressid = mattressid;
+                    mattress.creatmtrl_flag = 1;
 
-                DbSqlHelper.Update(cmd, mattress, "erp_mtrlid, creatmtrl_flag, erp_mtrlcode");
+                    DbSqlHelper.Update(cmd, mattress, "erp_mtrlid, creatmtrl_flag, erp_mtrlcode");
 
-                rslt.mattress = mattress;
+                    rslt.mattress = mattress;
+                }
             }
         }
 

JLHHJSvr/Excutor/CreatPrdPfExcutor.cs

@@ -23,7 +23,7 @@ namespace JLHHJSvr.Excutor
                 rslt.ErrMsg = "会话已经中断，请重新登录";
                 return;
             }
-            if (request.mattressid <= 0)
+            if (request.list.Count <= 0)
             {
                 rslt.ErrMsg = "床垫id参数为空!";
                 return;
@@ -34,128 +34,131 @@ namespace JLHHJSvr.Excutor
             {
                 con.Open();
 
-                var mattress = new u_mattress();
-                if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", request.mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid,erp_configcodetype") != 1)
+                foreach (var mattressid in request.list)
                 {
-                    rslt.ErrMsg = "床垫报价单匹配失败";
-                    return;
-                }
+                    var mattress = new u_mattress();
+                    if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid,erp_configcodetype") != 1)
+                    {
+                        rslt.ErrMsg = "床垫报价单匹配失败";
+                        return;
+                    }
 
-                var mattress_interface_qd_list = new List<u_mattress_interface_qd>();
-
-                var selectStr = @"SELECT u_mattress_interface_qd.mattressid 
-	                            ,u_mattress_interface_qd.printid 
-	                            ,u_mattress_interface_qd.itemname 
-	                            ,u_mattress_interface_qd.bj_pzname 
-	                            ,u_mattress_interface_qd.bj_pzname_mx 
-	                            ,u_mattress_interface_qd.bj_pzname_mx_mx 
-	                            ,u_mattress_interface_qd.mtrlid 
-	                            ,u_mattress_interface_qd.erp_mtrlid 
-	                            ,u_mattress_interface_qd.useqty 
-	                            ,u_mattress_interface_qd.dscrp 
-	                            ,u_mtrl_price.name AS mtrlname
-	                            ,u_mattress_interface_qd.actual_useqty 
-	                            ,u_mattress_interface_qd.qd_actual_size 
-	                            ,u_mattress_interface_qd.qd_pfgroupqty 
-	                            ,u_mattress_interface_qd.wrkgrpid 
-	                            ,u_mattress_interface_qd.wrkgrpid2 
-	                            ,u_mattress_interface_qd.wrkgrpcode1
-	                            ,u_mattress_interface_qd.wrkgrpcode2
-	                            ,u_mattress_interface_qd.ss_rate 
-	                            ,u_mattress_interface_qd.ls_rate 
-	                            ,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,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);
-
-
-                var ll_temp_dftwrkgrpid = 0;
-
-                // var ErpMtrl = new erp_mtrldef() { mtrlid = mattress.erp_mtrlid };
-                // if (DbSqlHelper.SelectOne(erp_cmd, ErpMtrl, "dftwrkgrpid") == 1)
-                // {
-                //     ll_temp_dftwrkgrpid = ErpMtrl.dftwrkgrpid.Value;
-                // }
-
-                var pfcode = $"{mattress.erp_mtrlcode}_V2.0";
-                var l1Req = new SavePrdPfRequest()
-                {
-                    mtrl_pf = new u_mtrl_pf()
+                    var mattress_interface_qd_list = new List<u_mattress_interface_qd>();
+
+                    var selectStr = @"SELECT u_mattress_interface_qd.mattressid 
+	                                ,u_mattress_interface_qd.printid 
+	                                ,u_mattress_interface_qd.itemname 
+	                                ,u_mattress_interface_qd.bj_pzname 
+	                                ,u_mattress_interface_qd.bj_pzname_mx 
+	                                ,u_mattress_interface_qd.bj_pzname_mx_mx 
+	                                ,u_mattress_interface_qd.mtrlid 
+	                                ,u_mattress_interface_qd.erp_mtrlid 
+	                                ,u_mattress_interface_qd.useqty 
+	                                ,u_mattress_interface_qd.dscrp 
+	                                ,u_mtrl_price.name AS mtrlname
+	                                ,u_mattress_interface_qd.actual_useqty 
+	                                ,u_mattress_interface_qd.qd_actual_size 
+	                                ,u_mattress_interface_qd.qd_pfgroupqty 
+	                                ,u_mattress_interface_qd.wrkgrpid 
+	                                ,u_mattress_interface_qd.wrkgrpid2 
+	                                ,u_mattress_interface_qd.wrkgrpcode1
+	                                ,u_mattress_interface_qd.wrkgrpcode2
+	                                ,u_mattress_interface_qd.ss_rate 
+	                                ,u_mattress_interface_qd.ls_rate 
+	                                ,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,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, mattress_interface_qd_list);
+
+
+                    var ll_temp_dftwrkgrpid = 0;
+
+                    // var ErpMtrl = new erp_mtrldef() { mtrlid = mattress.erp_mtrlid };
+                    // if (DbSqlHelper.SelectOne(erp_cmd, ErpMtrl, "dftwrkgrpid") == 1)
+                    // {
+                    //     ll_temp_dftwrkgrpid = ErpMtrl.dftwrkgrpid.Value;
+                    // }
+
+                    var pfcode = $"{mattress.erp_mtrlcode}_V2.0";
+                    var l1Req = new SavePrdPfRequest()
                     {
-                        mtrlid = mattress.erp_mtrlid.Value,
-                        pfcode = pfcode,
-                        ifdft = 1,
-                        inuse = 1,
-                        opemp = tokendata.usercode,
-                        opdate = DateTime.Now,
-                        flag = 1,
-                        auditdate = DateTime.Now,
-                        auditemp = tokendata.usercode,
-                        wrkid = ll_temp_dftwrkgrpid
-                    },
-                    prdPfs = new List<u_PrdPF>()
-                };
-
-                var i = 0;
-                foreach (var mx in mattress_interface_qd_list)
-                {
+                        mtrl_pf = new u_mtrl_pf()
+                        {
+                            mtrlid = mattress.erp_mtrlid.Value,
+                            pfcode = pfcode,
+                            ifdft = 1,
+                            inuse = 1,
+                            opemp = tokendata.usercode,
+                            opdate = DateTime.Now,
+                            flag = 1,
+                            auditdate = DateTime.Now,
+                            auditemp = tokendata.usercode,
+                            wrkid = ll_temp_dftwrkgrpid
+                        },
+                        prdPfs = new List<u_PrdPF>()
+                    };
 
-                    var ls_temp_pfgroup = mx.itemname + '-' + mx.bj_pzname;
-                    var ll_cnt_temp = 0;
-                    for (var j = 0; j < i - 1; j++)
+                    var i = 0;
+                    foreach (var mx in mattress_interface_qd_list)
                     {
-                        if (ls_temp_pfgroup == mattress_interface_qd_list[j].itemname + '-' + mattress_interface_qd_list[j].bj_pzname)
+
+                        var ls_temp_pfgroup = mx.itemname + '-' + mx.bj_pzname;
+                        var ll_cnt_temp = 0;
+                        for (var j = 0; j < i - 1; j++)
                         {
-                            ll_cnt_temp++;
+                            if (ls_temp_pfgroup == mattress_interface_qd_list[j].itemname + '-' + mattress_interface_qd_list[j].bj_pzname)
+                            {
+                                ll_cnt_temp++;
+                            }
+                        }
+                        if (ll_cnt_temp > 0)
+                        {
+                            ls_temp_pfgroup = ls_temp_pfgroup + (ll_cnt_temp).ToString();
                         }
-                    }
-                    if (ll_cnt_temp > 0)
-                    {
-                        ls_temp_pfgroup = ls_temp_pfgroup + (ll_cnt_temp).ToString();
-                    }
 
-                    string ls_azcode = i.ToString("D3");
+                        string ls_azcode = i.ToString("D3");
 
-                    var prdpf = new u_PrdPF()
-                    {
-                        mtrlid = mattress.erp_mtrlid.Value,
-                        pfcode = pfcode,
-                        pfgroup = ls_temp_pfgroup,
-                        SonMtrlid = mx.erp_mtrlid,
-                        wrkgrpid = mx.wrkgrpid,
-                        wrkgrpcode1 = mx.wrkgrpcode1,
-                        wrkgrpcode2 = mx.wrkgrpcode2,
-                        sonpfcode = "[常规]",
-                        dscrp = mx.bj_pzname_mx_mx,
-                        pfgroupqty = mx.qd_pfgroupqty,
-                        Sonscale = mx.actual_useqty,
-                        pfklmode = mx.qd_actual_size,
-                        printid = mx.printid,
-                        azcode = ls_azcode,
-                        promode = mx.ss_rate.ToString(),
-                        SonLoss = mx.sh_rate,
-                        SonDECLosS = 0,
-                    };
-                    l1Req.prdPfs.Add(prdpf);
-                    i++;
-                }
+                        var prdpf = new u_PrdPF()
+                        {
+                            mtrlid = mattress.erp_mtrlid.Value,
+                            pfcode = pfcode,
+                            pfgroup = ls_temp_pfgroup,
+                            SonMtrlid = mx.erp_mtrlid,
+                            wrkgrpid = mx.wrkgrpid,
+                            wrkgrpcode1 = mx.wrkgrpcode1,
+                            wrkgrpcode2 = mx.wrkgrpcode2,
+                            sonpfcode = "[常规]",
+                            dscrp = mx.bj_pzname_mx_mx,
+                            pfgroupqty = mx.qd_pfgroupqty,
+                            Sonscale = mx.actual_useqty,
+                            pfklmode = mx.qd_actual_size,
+                            printid = mx.printid,
+                            azcode = ls_azcode,
+                            promode = mx.ss_rate.ToString(),
+                            SonLoss = mx.sh_rate,
+                            SonDECLosS = 0,
+                        };
+                        l1Req.prdPfs.Add(prdpf);
+                        i++;
+                    }
 
-                l1Req.token = GlobalVar.ERP_TOKEN;
+                    l1Req.token = GlobalVar.ERP_TOKEN;
 
-                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
-                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
+                    var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
+                    l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
 
-                l1Helper.CheckLogin();
+                    l1Helper.CheckLogin();
 
-                var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));
-                rslt.ErrMsg = $"{l1Rslt.GetValue("ErrMsg")}";
+                    var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));
+                    rslt.ErrMsg = $"{l1Rslt.GetValue("ErrMsg")}";
 
-                if (!string.IsNullOrEmpty(rslt.ErrMsg))
-                {
-                    mattress.creatmtrlqd_flag = 1;
-                    mattress.mattressid = request.mattressid;
-                    DbSqlHelper.Update(cmd, mattress, "creatmtrlqd_flag");
+                    if (!string.IsNullOrEmpty(rslt.ErrMsg))
+                    {
+                        mattress.creatmtrlqd_flag = 1;
+                        mattress.mattressid = mattressid;
+                        DbSqlHelper.Update(cmd, mattress, "creatmtrlqd_flag");
+                    }
                 }
             }
         }

JLHHJSvr/Excutor/DelMtrlPfExcutor.cs

@@ -29,7 +29,7 @@ namespace JLHHJSvr.Excutor
                 rslt.ErrMsg = "会话已经中断，请重新登录";
                 return;
             }
-            if (request.mattressid <= 0)
+            if (request.list.Count <= 0)
             {
                 rslt.ErrMsg = "床垫id参数为空!";
                 return;
@@ -47,35 +47,38 @@ namespace JLHHJSvr.Excutor
                     throw new LJCommonException("你没有删除清单权限");
                 }
 
-                var mattress = new u_mattress();
-                if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", request.mattressid } }, mattress, "erp_mtrlid, creatmtrlqd_flag") != 1)
+                foreach (var mattressid in request.list)
                 {
-                    rslt.ErrMsg = "床垫报价单匹配失败";
-                    return;
-                }
-                if (mattress.erp_mtrlid <= 0)
-                {
-                    rslt.ErrMsg = "床垫清单还没匹配L1成品";
-                    return;
-                }
-                if (mattress.creatmtrlqd_flag == 0)
-                {
-                    rslt.ErrMsg = "床垫未生成erp清单，不能删除erp清单！";
-                    return;
-                }
+                    var mattress = new u_mattress();
+                    if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", mattressid } }, mattress, "erp_mtrlid, creatmtrlqd_flag") != 1)
+                    {
+                        rslt.ErrMsg = "床垫报价单匹配失败";
+                        return;
+                    }
+                    if (mattress.erp_mtrlid <= 0)
+                    {
+                        rslt.ErrMsg = "床垫清单还没匹配L1成品";
+                        return;
+                    }
+                    if (mattress.creatmtrlqd_flag == 0)
+                    {
+                        rslt.ErrMsg = "床垫未生成erp清单，不能删除erp清单！";
+                        return;
+                    }
 
-                var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
-                l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
+                    var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
+                    l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
 
-                l1Helper.CheckLogin();
-                var l1Req = new JObject()
-                {
-                    ["token"] = GlobalVar.ERP_TOKEN,
-                    ["mtrlid"] = mattress.erp_mtrlid,
-                };
+                    l1Helper.CheckLogin();
+                    var l1Req = new JObject()
+                    {
+                        ["token"] = GlobalVar.ERP_TOKEN,
+                        ["mtrlid"] = mattress.erp_mtrlid,
+                    };
 
-                var l1Rslt = l1Helper.DoExecute("DelPrdPf", l1Req);
-                rslt.ErrMsg = $"{l1Rslt.GetValue("ErrMsg")}";
+                    var l1Rslt = l1Helper.DoExecute("DelPrdPf", l1Req);
+                    rslt.ErrMsg = $"{l1Rslt.GetValue("ErrMsg")}";
+                }
             }
         }
     }

JLHHJSvr/Helper/BedNetHelper.cs

@@ -1254,7 +1254,17 @@ namespace JLHHJSvr.Helper
             AddKeyValue("卷包", bednet.if_jb);
 
             AddKeyValue("大小单系数", bednet.dannum_rate != null ? bednet.dannum_rate : 0);
-            AddKeyValue("大小单类型", bednet.dannum_type != null ? bednet.dannum_type : 0);
+            var _dannumType = 0;
+            // 备货床网，勾选则不按床垫大小单系数，统一使用标准系数计算
+            if (bednet.if_stock_up == 1)
+            {
+                _dannumType = 2;
+            }
+            else
+            {
+                _dannumType = bednet.dannum_type != null ? bednet.dannum_type.Value : 0;
+            }
+            AddKeyValue("大小单类型", _dannumType);
             // 实时获取变量
 
             selectStr = @"SELECT u_bednet_varmx.varid AS varid
@@ -2163,7 +2173,7 @@ namespace JLHHJSvr.Helper
                                         fabrics2_weight_replace_formula,felt_weight_replace_formula,cnail_weight_replace_formula,sponge_weight_replace_formula,
                                         sponge_weight_tc_replace_formula,edge_weight_replace_formula,fork_weight_replace_formula,spring_weight_qty,
                                         side_iron_weight_qty,hard_around_weight_qty,fabrics1_weight_qty,fabrics2_weight_qty,felt_weight_qty,cnail_weight_qty,
-                                        sponge_weight_qty,sponge_weight_tc_qty,edge_weight_qty,fork_weight_qty,sum_weight,if_jb,flag";
+                                        sponge_weight_qty,sponge_weight_tc_qty,edge_weight_qty,fork_weight_qty,sum_weight,if_jb,flag,if_stock_up";
 
             var fieldsMx = @"bednetmxid,bednetid,spring_qty_width,spring_qty_length,bednet_height,wire_mtrlid,springid,if_part,if_15strip,
                                         if_pocket_around,pocket_around_springid,pocket_around_row,pocket_around_wire_price,pocket_around_spring_cost,