核价后台：1、修改特殊工艺表格结构；2、修复已审批复制特殊工艺记录异常

JLHHJSvr/Com/Model/u_mattress_extra_type.cs

@@ -33,5 +33,9 @@ namespace JLHHJSvr.Com.Model
         /// 建立时间
         /// </summary>
         public DateTime? createtime { get; set; }
+        /// <summary>
+        /// 录入类型
+        /// </summary>
+        public int? inputtype { get; set; }
     }
 }

JLHHJSvr/DataStore/_Mapper_mattressextra.xml

@@ -2,7 +2,8 @@
 <select>
   <selectstr>
 	SELECT extraid,
-		typename
+		typename,
+		inputtype
 	FROM u_mattress_extra_type
   </selectstr>
   <where>

JLHHJSvr/DataStore/web_mattress_extralist.xml

@@ -10,7 +10,7 @@
 			,dscrp
 			,qty
 			,u_mattress_extra.inuse
-			,inputtype
+			,u_mattress_extra.inputtype
 			,ifinit
 		From u_mattress_extra
 		inner join u_mattress_extra_type on u_mattress_extra_type.extraid = u_mattress_extra.extraid

JLHHJSvr/DataStore/web_mattress_mx_extra.xml

@@ -8,13 +8,14 @@
 			u_mattress_mx_extra.extraname,
 			u_mattress_mx_extra.price,
 			u_mattress_mx_extra.qty,
-			u_mattress_extra.inputtype,
+			ISNULL(u_mattress_extra_type.inputtype, 0) as extrainputtype,
+			ISNULL(u_mattress_extra.inputtype, 0) as 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.extramxid = u_mattress_mx_extra.extraid 
-		LEFT OUTER JOIN u_mattress_extra_type On u_mattress_extra_type.extraid = u_mattress_extra.extraid
+		Left OUTER JOIN u_mattress_extra_type On u_mattress_extra_type.extraid = u_mattress_mx_extra.extraid
+		Left OUTER JOIN u_mattress_extra On u_mattress_extra.extramxid = u_mattress_mx_extra.extramxid
 	</selectstr>
 	<where>
 		<when notnull="@arg_mattressid">
@@ -36,6 +37,6 @@
 		<field field="price" datatype="number">金额</field>
 		<field field="qty" datatype="number">数量</field>
 		<field field="dscrp">备注</field>
-		<field field="inputtype" mapper="">输入类型</field>
+		<field field="inputtype" mapper="u_mattress_extra.inputtype">输入类型</field>
 	</displayfields>
 </select>

JLHHJSvr/Excutor/GetMattressImportDW2Excutor.cs

@@ -323,7 +323,7 @@ namespace JLHHJSvr.Excutor
 			                        ,dscrp
                                     ,qty
 			                        ,u_mattress_extra.inuse
-			                        ,inputtype
+			                        ,u_mattress_extra.inputtype
 			                        ,ifinit
 		                        From u_mattress_extra
 		                        inner join u_mattress_extra_type on u_mattress_extra_type.extraid = u_mattress_extra.extraid 
@@ -346,11 +346,12 @@ namespace JLHHJSvr.Excutor
                                     ,typename
                                     ,typeid
                                     ,inuse
+                                    ,inputtype
                                     ,createby
                                     ,createtime
 		                        From u_mattress_extra_type
 		                        ";
-            outFields = "extraid, typename, typeid, inuse, createby, createtime";
+            outFields = "extraid, typename, typeid, inuse, createby, createtime, inputtype";
             whereList = new List<string>();
             whereList.Add("u_mattress_extra_type.inuse = 0");
             param = new Dictionary<string, object>();

JLHHJSvr/Excutor/SaveMattressExtraTypeExcutor.cs

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