1、修复床网报价sql语句判断错误；2、修复床垫报价大侧顺序错误

JLHHJSvr/Excutor/GetMattressImportDW2Excutor.cs

@@ -223,6 +223,7 @@ namespace JLHHJSvr.Excutor
                         rslt.diancengarea = wf_add_dianceng_area_bytype(cmd, mattersstype.dianceng_area);
                     }
 
+                    // 明细排序
                     helper.wf_sort_mx(ref dw_2);
 
                     if (request.mattressid == 0)

JLHHJSvr/Helper/BedNetHelper.cs

@@ -520,7 +520,7 @@ namespace JLHHJSvr.Helper
                 if (!string.IsNullOrEmpty(bednet.packet_mtrl_formula) && !string.IsNullOrEmpty(bednet.packtype))
                 {
                     bednet.packet_mtrl_cost_replace_formula = bednet.packet_mtrl_formula;
-                    bool sqlCal = !string.IsNullOrEmpty(bednet.packet_mtrl_formula) && bednet.packet_mtrl_formula.Substring(0, 2) == "@@";
+                    bool sqlCal = !string.IsNullOrEmpty(bednet.packet_mtrl_formula) && bednet.packet_mtrl_formula.TrimStart().Substring(0, 2) == "@@";
                     bednet.packet_mtrl_cost_replace_formula = bednet.packet_mtrl_cost_replace_formula.Replace("@@", "");
 
                     if(sqlCal) bednet.packet_mtrl_cost += Convert.ToDecimal(SqlCalculate(bednet.packet_mtrl_cost_replace_formula, "包装总成本"));
@@ -535,7 +535,7 @@ namespace JLHHJSvr.Helper
                 if (!string.IsNullOrEmpty(bednet.packet_hr_formula) && !string.IsNullOrEmpty(bednet.packtype))
                 {
                     bednet.packet_hr_cost_replace_formula = bednet.packet_hr_formula;
-                    bool sqlCal = !string.IsNullOrEmpty(bednet.packet_hr_formula) && bednet.packet_hr_formula.Substring(0, 2) == "@@";
+                    bool sqlCal = !string.IsNullOrEmpty(bednet.packet_hr_formula) && bednet.packet_hr_formula.TrimStart().Substring(0, 2) == "@@";
                     bednet.packet_hr_cost_replace_formula = bednet.packet_hr_cost_replace_formula.Replace("@@", "");
 
                     if (sqlCal) bednet.packet_hr_cost += Convert.ToDecimal(SqlCalculate(bednet.packet_hr_cost_replace_formula, "包装人工成本"));

JLHHJSvr/Helper/MattressHelper.cs

@@ -2219,11 +2219,33 @@ namespace JLHHJSvr.Helper
                 {
                     return a.sortcode.CompareTo(b.sortcode);
                 }
+
+                int result = GetFormulakindOrder(a.formulakind).CompareTo(GetFormulakindOrder(b.formulakind));
+                if (result != 0)
+                {
+                    return result;
+                }
+
                 return a.formulaid.Value.CompareTo(b.formulaid.Value);
             });
         }
         #endregion
 
+        // 普通大侧特殊排序
+        private int GetFormulakindOrder(int? formulakind)
+        {
+            switch (formulakind)
+            {
+                case 2: return 1;
+                case 82: return 2;
+                case 42: return 3;
+                case 52: return 4;
+                case 62: return 5;
+                case 72: return 6;
+                default: return int.MaxValue;
+            }
+        }
+
         #region 获取物料信息
         public void wf_mtrl_fine(List<int> arg_mtrlid, int arg_pricelistid, ref List<u_mtrl_price> mtrlList)
         {