1、增加显示每个金额类型的不含税出厂价、FOB费、柜型、税率、佣金点数

JLHHJSvr/Com/Model/u_his_price.cs

@@ -22,6 +22,13 @@ namespace JLHHJSvr.Com.Model
         public decimal? dannum_cost2 { get; set; }
         public decimal? dannum_cost3 { get; set; }
         public decimal? dannum_cost4 { get; set; }
-
+        public decimal? dijia_cost1 { get; set; }
+        public decimal? dijia_cost2 { get; set; }
+        public decimal? dijia_cost3 { get; set; }
+        public decimal? dijia_cost4 { get; set; }
+        public decimal? fob { get; set; }
+        public decimal? taxrate { get; set; }
+        public decimal? commission { get; set; }
+        public string cabinet_type { get; set; }
     }
 }

JLHHJSvr/DataStore/web_his_price.xml

@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <select>
 	<selectstr>
-		select
-			bednetid_mattressid,
-			cmpdate,
-			cmpemp,
-			nottax_dept_cost,
-			dept_cost,
-			foreign_cost,
-			typeid,
-            dannum_cost1,
-            dannum_cost2,
-            dannum_cost3,
-            dannum_cost4
-		from u_his_price
+SELECT bednetid_mattressid
+	,cmpdate
+	,cmpemp
+	,nottax_dept_cost
+	,dept_cost
+	,foreign_cost
+	,typeid
+	,dannum_cost1
+	,dannum_cost2
+	,dannum_cost3
+	,dannum_cost4
+	,dijia_cost1
+	,dijia_cost2
+	,dijia_cost3
+	,dijia_cost4
+	,fob
+	,cabinet_type
+	,taxrate
+	,commission
+FROM u_his_price
 	</selectstr>
 	<where>
 		<when notnull="@arg_id">

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -857,7 +857,29 @@ namespace JLHHJSvr.Helper
             });
             // 按照nameSet排序
             Dictionary<string, int> orderDict = nameSet.Select((name, index) => new { Name = name, Index = index }).ToDictionary(x => x.Name, x => x.Index);
-            var fuliaoList = mxlist.Where(t => t.formulatype == 2).OrderBy(t => orderDict.ContainsKey(t.mtrlname) ? orderDict[t.mtrlname] : int.MaxValue).ThenBy(t => !orderDict.ContainsKey(t.mtrlname) ? t.mtrlname : null).ToList();
+            //var fuliaoList = mxlist.Where(t => t.formulatype == 2).OrderBy(t => orderDict.ContainsKey(t.mtrlname) ? orderDict[t.mtrlname] : int.MaxValue).ThenBy(t => !orderDict.ContainsKey(t.mtrlname) ? t.mtrlname : null).ToList();
+            var resultDict = new Dictionary<int, u_mattress_mx_mtrl>();
+            foreach (var item in mxlist.Where(t => t.formulatype == 2))
+            {
+                if (!resultDict.ContainsKey(item.mtrlid.Value))
+                {
+                    resultDict.Add(item.mtrlid.Value, item);
+                }
+                else
+                {
+                    resultDict[item.mtrlid.Value].qty += item.qty.Value;
+                }
+            }
+
+            var fuliaoList = new List<u_mattress_mx_mtrl>();
+            foreach (var kvp in resultDict)
+            {
+                fuliaoList.Add(kvp.Value);
+            }
+
+            fuliaoList = fuliaoList.OrderBy(t => orderDict.ContainsKey(t.mtrlname) ? orderDict[t.mtrlname] : int.MaxValue)
+              .ThenBy(t => !orderDict.ContainsKey(t.mtrlname) ? t.mtrlname : null)
+              .ToList();
 
             var extraSet = new HashSet<string>(new string[] { "采购小标", "打印小标", "合格证", "吊标", "斜标", "正标", "织唛", "织唛斜标", "客供标" });
             var specialSet = new HashSet<string>(new string[] { "打钮钮扣", "气钮" });
@@ -868,7 +890,6 @@ namespace JLHHJSvr.Helper
                 {
                     int cnt = Convert.ToInt32(Math.Abs(mx.qty.Value));
 
-
                     var mtrldef = new u_mtrl_price() { mtrlid = mx.mtrlid };
                     if (DbSqlHelper.SelectOne(cmd, mtrldef, "erp_mtrlid") == 1)
                     {

JLHHJSvr/Helper/MattressHelper.cs

@@ -598,7 +598,6 @@ namespace JLHHJSvr.Helper
             }
             AddKeyValue("特殊工艺费用", cost1);
 
-
             AddKeyValue("规格宽", mattress.mattress_width);
             AddKeyValue("规格长", mattress.mattress_length);
             AddKeyValue("规格高", mattress.mattress_height);
@@ -1720,9 +1719,17 @@ namespace JLHHJSvr.Helper
                 dannum_cost1 = mattress.dannum_cost1,
                 dannum_cost2 = mattress.dannum_cost2,
                 dannum_cost3 = mattress.dannum_cost3,
-                dannum_cost4 = mattress.dannum_cost4
+                dannum_cost4 = mattress.dannum_cost4,// dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4,fob,mattress.cabinet_type,mattress.taxrate,mattress.commission
+                dijia_cost1 = mattress.dijia_cost1,
+                dijia_cost2 = mattress.dijia_cost2,
+                dijia_cost3 = mattress.dijia_cost3,
+                dijia_cost4 = mattress.dijia_cost4,
+                fob = mattress.fob,
+                cabinet_type = mattress.cabinet_type,
+                taxrate = mattress.taxrate,
+                commission = mattress.commission
             };
-            var fieldsHs = "bednetid_mattressid, typeid, cmpdate, cmpemp, nottax_dept_cost, dept_cost, foreign_cost, dannum_cost1, dannum_cost2, dannum_cost3, dannum_cost4";
+            var fieldsHs = "bednetid_mattressid, typeid, cmpdate, cmpemp, nottax_dept_cost, dept_cost, foreign_cost, dannum_cost1, dannum_cost2, dannum_cost3, dannum_cost4,dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4,fob,cabinet_type,taxrate,commission";
             DbSqlHelper.Insert(cmd, "u_his_price", null, hisprice, fieldsHs);
         }
         public u_mattress GetMattress(int mattressid)
@@ -3048,7 +3055,7 @@ namespace JLHHJSvr.Helper
         }
         #endregion
 
-        #region 明细排序
+        #region 床垫明细排序
         /// <summary>
         /// 明细排序
         /// </summary>
@@ -3092,6 +3099,13 @@ namespace JLHHJSvr.Helper
         }
         #endregion
 
+        #region 显示报价清单
+        public void ShowQuoteList(int mattressid)
+        {
+
+        }
+        #endregion
+
         // 普通大侧特殊排序
         private int GetFormulakindOrder(int? formulakind)
         {
@@ -3312,8 +3326,6 @@ namespace JLHHJSvr.Helper
         #endregion
 
         #region 大小单类型枚举
-
-
         public enum DannumType
         {
             /// <summary>

JLHWEB/src/components/ToastWidget/HistoryPrice/components/Item.vue

@@ -96,19 +96,19 @@
         <div class="oa-flow-item__right-content-title flx-col flx-center">
           <div class="text-f-c text-disable">柜型</div>
           <span class="text-h5-b text-primary-text">
-            {{ isFilterPrice(item?.dannum_cost4) }}
+            {{ isFilterPrice(item?.cabinet_type) }}
           </span>
         </div>
         <div class="oa-flow-item__right-content-title flx-col flx-center">
           <div class="text-f-c text-disable">税率</div>
           <span class="text-h5-b text-primary-text">
-            {{ isFilterPrice(item?.dannum_cost2) }}
+            {{ isFilterPrice(item?.taxrate) }}
           </span>
         </div>
         <div class="oa-flow-item__right-content-title flx-col flx-center">
           <div class="text-f-c text-disable">佣金点数</div>
           <span class="text-h5-b text-primary-text">
-            {{ isFilterPrice(item?.dannum_cost3) }}
+            {{ isFilterPrice(item?.commission) }}
           </span>
         </div>
         <!-- </div> -->