核价后台：1、优化特殊工艺数据枚举结构；2、更新相关xml接口

JLHHJSvr/Com/Model/u_mattress_extra.cs

@@ -29,6 +29,7 @@ namespace JLHHJSvr.Com.Model
         /// 默认金额
         /// </summary>
         public decimal? price { get; set; }
+        public decimal? qty { get; set; }
         /// <summary>
         /// 备注
         /// </summary>

JLHHJSvr/Com/Model/u_mattress_mx_extra.cs

@@ -41,6 +41,10 @@ namespace JLHHJSvr.Com.Model
         /// 项目类型id
         /// </summary>
         public int? typeid { get; set; }
+        /// <summary>
+        /// 录入类型
+        /// </summary>
+        public int? inputtype { get; set; }
 
     }
 }

JLHHJSvr/DataStore/web_mattress_extralist.xml

@@ -8,6 +8,7 @@
 			,u_mattress_extra_type.typeid
 			,price
 			,dscrp
+			,qty
 			,u_mattress_extra.inuse
 			,inputtype
 			,ifinit
@@ -31,6 +32,7 @@
 		<field field="extraid" mapper="u_mattress_extra_type.mattressextra">项目类型</field>
 		<field field="extramxname">项目名称</field>
 		<field field="price" datatype="number">金额</field>
+		<field field="qty" datatype="number">数量</field>
 		<field field="dscrp">备注</field>
 		<field field="ifinit" datatype="checkbox">自动导入</field>
 		<field field="inputtype" mapper="">录入类型</field>

JLHHJSvr/DataStore/web_mattress_mx_extra.xml

@@ -5,22 +5,23 @@
 			u_mattress_mx_extra.mattressid,
 			u_mattress_mx_extra.mattressmxid,
 			u_mattress_mx_extra.extraid,
-			u_mattress_extra.extratypename,
 			u_mattress_mx_extra.extraname,
 			u_mattress_mx_extra.price,
 			u_mattress_mx_extra.qty,
+			u_mattress_extra.inputtype,
 			'+' as addmx,
 			'-' as delmx,
 			u_mattress_mx_extra.dscrp
 		From u_mattress_mx_extra
-		Left OUTER JOIN u_mattress_extra On u_mattress_extra.extraid = u_mattress_mx_extra.extraid
+		LEFT OUTER JOIN u_mattress_extra On u_mattress_extra.extramxid = u_mattress_mx_extra.extraid 
+		LEFT OUTER JOIN u_mattress_extra_type On u_mattress_extra_type.extraid = u_mattress_extra.extraid
 	</selectstr>
 	<where>
-		<when notnull="@arg_mattressid" arg_mattressid!="0">
+		<when notnull="@arg_mattressid">
 			u_mattress_mx_extra.mattressid = @arg_mattressid
 		</when>
 		<when notnull="@arg_typeid">
-			u_mattress_extra.typeid = @arg_typeid
+			u_mattress_extra_type.typeid = @arg_typeid
 		</when>
 		<when notnull="@arg_ifinit">
 			u_mattress_extra.ifinit = @arg_ifinit
@@ -30,10 +31,11 @@
 		<field field="pid" compute="getrow()">序</field>
 		<field field="addmx">+</field>
 		<field field="delmx">-</field>
-		<field field="extratypename" mapper="u_mattress_extra.mattressextra">项目类型</field>
+		<field field="extraid" mapper="u_mattress_extra.mattressextra">项目类型</field>
 		<field field="extraname">项目名称</field>
 		<field field="price" datatype="number">金额</field>
 		<field field="qty" datatype="number">数量</field>
 		<field field="dscrp">备注</field>
+		<field field="inputtype" mapper="">输入类型</field>
 	</displayfields>
 </select>

JLHHJSvr/Excutor/GetMattressImportDW2Excutor.cs

@@ -265,10 +265,11 @@ namespace JLHHJSvr.Excutor
                         var extraEnum = new List<u_mattress_extra>();
                         var extraTypeEnum = new List<u_mattress_extra_type>();
                         getExtraType(cmd, ref extraTypeEnum, ref extraEnum);
-                        rslt.extraEnum = extraEnum;
+                        rslt.extraEnum = extraEnum.Where(item => item.ifinit.Value == 0).ToList();
                         rslt.extraTypeEnum = extraTypeEnum;
 
                         rslt.extraProcessesMx = new List<u_mattress_mx_extra>();
+                        rslt.extraCostsMx = new List<u_mattress_mx_extra>();
                         var processesMx = extraEnum.Where(item => item.ifinit == 1 && item.typeid == 1).ToArray();
                         var costsMx = extraEnum.Where(item => item.ifinit == 1 && item.typeid == 2).ToArray();
                         foreach (var mx in processesMx)
@@ -281,7 +282,9 @@ namespace JLHHJSvr.Excutor
                                 extraname = mx.extramxname,
                                 dscrp = mx.dscrp,
                                 price = mx.price,
-                                typeid = mx.typeid
+                                qty = mx.qty,
+                                typeid = mx.typeid,
+                                inputtype = mx.inputtype
                             };
                             rslt.extraProcessesMx.Add(mxItem);
                         }
@@ -295,7 +298,9 @@ namespace JLHHJSvr.Excutor
                                 extraname = mx.extramxname,
                                 dscrp = mx.dscrp,
                                 price = mx.price,
-                                typeid = mx.typeid
+                                qty = mx.qty,
+                                typeid = mx.typeid,
+                                inputtype = mx.inputtype
                             };
                             rslt.extraCostsMx.Add(mxItem);
                         }
@@ -316,6 +321,7 @@ namespace JLHHJSvr.Excutor
 			                        ,u_mattress_extra_type.typeid
 			                        ,price
 			                        ,dscrp
+                                    ,qty
 			                        ,u_mattress_extra.inuse
 			                        ,inputtype
 			                        ,ifinit
@@ -323,7 +329,7 @@ namespace JLHHJSvr.Excutor
 		                        inner join u_mattress_extra_type on u_mattress_extra_type.extraid = u_mattress_extra.extraid 
                                     AND u_mattress_extra_type.inuse = 0
 		                        ";
-            var outFields = "extraid,extramxname,typeid,price,dscrp,inuse,inputtype,ifinit";
+            var outFields = "extraid,extramxid,extramxname,typeid,price,dscrp,qty,inuse,inputtype,ifinit";
             var whereList = new List<string>();
             whereList.Add("u_mattress_extra.inuse = 0");
             var param = new Dictionary<string, object>();

JLHHJSvr/Excutor/SaveMattressExtraExcutor.cs

@@ -48,7 +48,7 @@ namespace JLHHJSvr.Excutor
                 {
                     try
                     {
-                        var fields = "extraid,extramxname,price,dscrp,inuse,ifinit,inputtype,createby,createtime";
+                        var fields = "extraid,extramxname,price,qty,dscrp,inuse,ifinit,inputtype,createby,createtime";
                         request.data.createby = tokendata.username;
                         request.data.createtime = DateTime.Now;
                         if (request.data.extramxid <= 0)

JLHHJSvr/Helper/BedNetHelper.cs

@@ -1326,12 +1326,9 @@ namespace JLHHJSvr.Helper
                 }
             }
 
-            if (price > 0)
-            {
-                AddKeyValue("加硬弹簧单价", price);
-                AddKeyValue("口袋弹簧单价", price);
-                AddKeyValue("弹簧单价", price);
-            }
+            AddKeyValue("加硬弹簧单价", price);
+            AddKeyValue("口袋弹簧单价", price);
+            AddKeyValue("弹簧单价", price);
         }
         /// <summary>
         /// 用于床网报价 弹簧材料总成本 弹簧人工总成本