|
|
@@ -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);
|