核价后台：1、床网新增备货逻辑判断；2、计算床网时，当引用其他部门的床网，计算时切换到当前部门下，当出现修改时，另存一套床网

JLHHJSvr/DataStore/web_bednet_define.xml

@@ -140,7 +140,9 @@
 		u_bednet.spring_weight_formula,
 		u_bednet_type.if_pocket_around,
 		u_bednet_type.if_hard_around,
-		u_bednet.if_stock_up
+		u_bednet.if_stock_up,
+		dannum_rate,
+		ISNULL(dannum_type, 2) AS dannum_type
 
 		From u_bednet
 		left join u_mtrl_price u_mtrl_sponge on   u_bednet.sponge_mtrlid=u_mtrl_sponge.mtrlid
@@ -290,5 +292,6 @@
 		<field field="moneyrate" mapper="u_mattress.if_moneyrate">币种</field>
 		<field field="extras_cost_dscrp">额外费用备注</field>
 		<field field="duo_qv_str" mapper="u_bednet.bednet_area">多区</field>
+		<field field="if_stock_up" datatype="checkbox">备货</field>
 	</displayfields>
 </select>

JLHHJSvr/Excutor/SaveBedNetExcutor.cs

@@ -121,7 +121,8 @@ namespace JLHHJSvr.Excutor
                             mattress_width = request.bednet.mattress_width,
                             mattress_length = request.bednet.mattress_length,
                             mattress_height = request.bednet.mattress_height,
-                            nottax_factory_cost = request.bednet.nottax_factory_cost
+                            nottax_factory_cost = request.bednet.nottax_factory_cost,
+                            total_cost = request.bednet.total_cost
                         };
                     }
                     catch (Exception e)

JLHHJSvr/Helper/BedNetHelper.cs

@@ -2017,7 +2017,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,if_jb";
+                                cnail_weight_qty,sponge_weight_qty,sponge_weight_tc_qty,edge_weight_qty,fork_weight_qty,if_jb,if_stock_up";
             DbSqlHelper.SelectOne(cmd, bednet, outputFields);
 
             return bednet;

JLHHJSvr/Helper/MattressHelper.cs

@@ -84,7 +84,7 @@ namespace JLHHJSvr.Helper
 
             InitReplaceMents(mattress, isNewFormula, extraProcesses, extraCosts);
 
-            if (isCalBed || isNewFormula) CalCulateBedNet(mxlist, isCalBed, isNewFormula);
+            if (isCalBed || isNewFormula) CalCulateBedNet(mxlist, isCalBed, isNewFormula, mattress.deptid.Value);
             // 实时计算价格
             if (isCalBed)
             {
@@ -311,7 +311,7 @@ namespace JLHHJSvr.Helper
             }
         }
 
-        private void CalCulateBedNet(List<u_mattress_mx_mtrl> mxlist, Boolean isCalBed = true, Boolean isNewFormula = true)
+        private void CalCulateBedNet(List<u_mattress_mx_mtrl> mxlist, Boolean isCalBed = true, Boolean isNewFormula = true, int deptid = 0)
         {
             var bedNetHelper = HelperBase.GetHelper<BedNetHelper>(cmd, new HelperBase.Context() { tokendata = context.tokendata });
 
@@ -338,6 +338,10 @@ namespace JLHHJSvr.Helper
 
                 var bednet = bedNetHelper.GetBedNet(mx.mtrlid.Value);
                 if (bednet.flag == 1) continue;
+                if (deptid > 0)
+                {
+                    bednet.deptid = deptid;
+                }
 
                 var bednetMxlist = bedNetHelper.GetBedNetMxList(bednet.bednetid.Value);
 
@@ -355,10 +359,10 @@ namespace JLHHJSvr.Helper
                 BendetFormulasReplace = bedNetHelper.FormulaReplacements.Where(itm => new List<int>{ 0, 1 }.Contains(itm.type.Value)).ToList();
                 rpBednet.Add(rpBednetItem);
 
-                if (isCalBed)
-                {
-                    bedNetHelper.SaveBedNet(bednet, bednetMxlist, bednetSpringList);
-                }
+                //if (isCalBed)
+                //{
+                //    bedNetHelper.SaveBedNet(bednet, bednetMxlist, bednetSpringList);
+                //}
 
                 if (isNewFormula)
                 {