Browse Source

1、修复刷新配置顶布裥棉空问题
2、修复刷新配置垫层排序问题

MY 1 day ago
parent
commit
aeebc956ee
1 changed files with 7 additions and 5 deletions
  1. 7 5
      JLHHJSvr/Helper/InterfaceHelper.cs

+ 7 - 5
JLHHJSvr/Helper/InterfaceHelper.cs

@@ -236,7 +236,7 @@ namespace JLHHJSvr.Helper
             var mattress_type = new u_mattress_type() { mattresstypeid = mattress.mattresstypeid };
             DbSqlHelper.SelectOne(cmd, mattress_type, "typename");
 
-            var mxlist = mattressHelper.GetMattressMxMtrl(mattressid, new List<string>() { "u_mattress_formula.formulatype IN (0,1,2,3,99,104)" });
+            var mxlist = mattressHelper.GetMattressMxMtrl(mattressid, new List<string>() { "u_mattress_formula.formulatype IN (0,1,2,3,99,104,103)" });
 
             var mxlist_103 = mattressHelper.GetMattressMxMtrl(mattressid, new List<string>() { "u_mattress_formula.formulatype = 103" });
 
@@ -297,7 +297,7 @@ namespace JLHHJSvr.Helper
             #endregion
 
             #region 内布套类清单导入
-            AutoSetFormulaType101Pz(mattress, mxlist_103, interfaceList);
+            AutoSetFormulaType101Pz(mattress, mxlist_101, interfaceList);
             #endregion
 
             #region 自定义配置导入
@@ -497,11 +497,13 @@ namespace JLHHJSvr.Helper
                 {"V侧3",new string[] { "V侧", "V侧3裥棉", "V侧3裥棉图案", "V侧说明" } }
             };
             var jianmianList = mxlist.Where(t => t.formulatype == 0).ToList();
+            var dingbuList = mxlist.Where(t => t.formulatype == 103).ToList();
 
             #region wf_import_qingdan + wf_import_qingdan_1 面料部分
             foreach (var item in powerDict)
             {
-                SetFormulaTypeZeroPz(jianmianList, interfaceList, item.Value, item.Key, chastrArrDict[item.Key]);
+                if(item.Key.Contains("顶布裥棉")) SetFormulaTypeZeroPz(dingbuList, interfaceList, item.Value, item.Key, chastrArrDict[item.Key]);
+                else SetFormulaTypeZeroPz(jianmianList, interfaceList, item.Value, item.Key, chastrArrDict[item.Key]);
             }
             #endregion
 
@@ -626,7 +628,7 @@ namespace JLHHJSvr.Helper
             {
                 for (int i = 0; i < mianList2.Length; i++)
                 {
-                    DingBuLianMian.SetValue(name_arr[i], i, 0);
+                    DingBuLianMian.SetValue(name_arr[i], Array.IndexOf(mianList2, key),i );
                 }
             }
 
@@ -750,7 +752,7 @@ namespace JLHHJSvr.Helper
             }
 
             var orderedKeys = new List<string>();
-            foreach (var kind in kindDict.OrderBy(k => k.Key))
+            foreach (var kind in kindDict)
             {
                 foreach (var cha in chastrSet)
                 {