核价后台：1、暂时取消床垫清单列表限制，方便数据迁移

JLHHJSvr/DataStore/web_mattress_formulalist.xml

@@ -56,7 +56,7 @@ FROM u_mattress_formula
     <field field="if_packtype0" datatype="checkbox">压包</field>
     <field field="if_packtype1" datatype="checkbox">卷包</field>
     <field field="if_packtype2" datatype="checkbox">国内</field>
-    <field field="default_mtrlid">默认物料</field>
+    <field field="default_mtrlid" mapper="mtrl_price">默认物料</field>
     <field field="mtrltype" mapper="mtrltypeid">物料类别</field>
     <field field="createby">登记人</field>
     <field field="createtime" datatype="datetime">登记时间</field>

JLHHJSvr/Helper/MattressHelper.cs

@@ -917,7 +917,7 @@ namespace JLHHJSvr.Helper
                 mattress.loading_type = "平压";
                 fob_expression = "【地区FOB费用】/（【柜型米数】 /（【规格宽】/ 100 +0.1）*（【压包数量】*2））";
 
-                if (mattress.packqty == 0) throw new LJCommonException("请填写压包数量!");
+                //if (mattress.packqty == 0) throw new LJCommonException("请填写压包数量!");
             }
             else if (mattress.packtype == 1)
             {
@@ -925,7 +925,7 @@ namespace JLHHJSvr.Helper
                 fob_expression = "【地区FOB费用】 /（【柜型立方数】 /( 3.14*（ 【卷包直径】    /100/2+0.03）*（  【卷包直径】  /100/2+0.03）*（【规格宽】/ 100 +0.05）））";
                 cubage_expression = "( 3.14*（ 【卷包直径】    /100/2+0.03）*（  【卷包直径】  /100/2+0.03）*（【规格宽】/ 100 +0.05））";
 
-                if (mattress.diameter == 0) throw new LJCommonException("请填写卷包直径!");
+                //if (mattress.diameter == 0) throw new LJCommonException("请填写卷包直径!");
 
                 var _bzList = mxlist.Where(t => t.formulatype == 3 && t.formulakind == 19).ToList();