Browse Source

补充提交

chen_yjin 1 day ago
parent
commit
672b5ec2fd
1 changed files with 17 additions and 4 deletions
  1. 17 4
      JLHHJSvr/Helper/MattressHelper.cs

+ 17 - 4
JLHHJSvr/Helper/MattressHelper.cs

@@ -2954,8 +2954,10 @@ namespace JLHHJSvr.Helper
             foreach (var childMx in child.mxList)
             {
                 var bednetIndex = 0; // 床网索引
-                var ifSubspecsIndex = 0; // 垫层主副规格物料索引
-                                         // 副规格床网自动匹配/新增逻辑
+                var cushionsIndex = 0; // 垫层主副规格物料索引
+                var accessoriesIndex = 0; // 辅料主副规格物料索引
+
+                // 副规格床网自动匹配/新增逻辑
                 if (childMx.formulatype == 99 && childMx.mtrlid > 0)
                 {
                     bednetIndex++;
@@ -3010,13 +3012,24 @@ namespace JLHHJSvr.Helper
                     }
 
                     // 副规格-垫层物料替换
-                    if (childMx.if_subspecs == 1 && child.DynamicFields.TryGetValue($"cushions_subspecs_{ifSubspecsIndex}", out var cushions_subspecs))
+                    if (childMx.if_subspecs == 1 && child.DynamicFields.TryGetValue($"cushions_subspecs_{cushionsIndex}", out var cushions_subspecs))
                     {
-                        ifSubspecsIndex++;
+                        cushionsIndex++;
                         childMx.mtrlid = Convert.ToInt32(cushions_subspecs);
                     }
                 }
 
+                // 辅料改动逻辑
+                if (childMx.formulatype == 2 && childMx.mtrlid > 0)
+                {
+                    // 副规格-辅料物料替换
+                    if (childMx.if_subspecs == 1 && child.DynamicFields.TryGetValue($"accessories_subspecs_{accessoriesIndex}", out var accessories_subspecs))
+                    {
+                        accessoriesIndex++;
+                        childMx.mtrlid = Convert.ToInt32(accessories_subspecs);
+                    }
+                }
+
                 // 内布套 / 顶部裥棉逻辑
                 if ((childMx.formulatype == 101 || childMx.formulatype == 102 || childMx.formulatype == 103) && childMx.mtrlid > 0 && (childMx.mattress_width > 0 || childMx.mattress_length > 0))
                 {