ソースを参照

1、床垫报价,修复分享报价报错问题
2、床垫报价,修复分享报价税率修改不生效问题

MY 4 日 前
コミット
7b00087e58

+ 3 - 2
JLHHJSvr/Helper/MattressHelper.cs

@@ -2059,6 +2059,7 @@ namespace JLHHJSvr.Helper
                 mattress_copy.xd_flag = 0;
                 mattress_copy.commission = mattress.commission;
                 mattress_copy.taxes = mattress.taxes;
+                mattress_copy.taxrate = mattress.taxrate;
                 mattress_copy.other_rate = mattress.other_rate;
                 mattress_copy.extras_cost = mattress.extras_cost;
                 mattress_copy.moneyrate = mattress.moneyrate;
@@ -2840,7 +2841,7 @@ namespace JLHHJSvr.Helper
                     }
 
                     // 副规格-垫层物料替换
-                    if (childMx.if_subspecs == 1 && child.DynamicFields.TryGetValue($"cushions_subspecs_{cushionsIndex}", out var cushions_subspecs))
+                    if (childMx.if_subspecs == 1 && child.DynamicFields != null && child.DynamicFields.TryGetValue($"cushions_subspecs_{cushionsIndex}", out var cushions_subspecs))
                     {
                         childMx.mtrlid = Convert.ToInt32(cushions_subspecs);
                         cushionsIndex++;
@@ -2851,7 +2852,7 @@ namespace JLHHJSvr.Helper
                 if (childMx.formulatype == 2 && childMx.mtrlid > 0)
                 {
                     // 副规格-辅料物料替换
-                    if (childMx.if_subspecs == 1 && child.DynamicFields.TryGetValue($"accessories_subspecs_{accessoriesIndex}", out var accessories_subspecs))
+                    if (childMx.if_subspecs == 1 && child.DynamicFields != null && child.DynamicFields.TryGetValue($"accessories_subspecs_{accessoriesIndex}", out var accessories_subspecs))
                     {
                         child.DynamicFields.TryGetValue($"accessories_subspecs_qty_{accessoriesIndex}", out object accessories_subspecs_qty);
                         childMx.mtrlid = Convert.ToInt32(accessories_subspecs);

+ 1 - 0
JLHWEB/src/views/quote/mattressQuote/index.vue

@@ -820,6 +820,7 @@ const BatchCopyMattressAudited = () => {
       createby: formParam.value.createby,
       commission: formParam.value.commission,
       taxes: formParam.value.taxes,
+      taxrate: formParam.value.taxes,
       other_rate: formParam.value.other_rate,
       extras_cost: formParam.value.extras_cost,
       moneyrate: formParam.value.moneyrate,