补充提交

JLHHJSvr/Com/Model/u_mattress_mx_extra.cs

@@ -49,6 +49,10 @@ namespace JLHHJSvr.Com.Model
         /// 录入类型
         /// </summary>
         public int? inputtype { get; set; }
+        /// <summary>
+        /// 挂载的核价物料id
+        /// </summary>
+        public int? mtrlid { get; set; }
 
     }
 }

JLHHJSvr/Com/Model/u_mtrl_price.cs

@@ -102,5 +102,9 @@ namespace JLHHJSvr.Com.Model
         /// 需要主副规格调整的物料
         /// </summary>
         public int? if_subspecs { get; set; }
+        /// <summary>
+        /// 特殊工艺费用
+        /// </summary>
+        public decimal? extra_cost { get; set; }
     }
 }

JLHHJSvr/DataStore/web_mattress.xml

@@ -87,7 +87,11 @@
 		 dannum_cost1,
 		 dannum_cost2,
 		 dannum_cost3,
-		 dannum_cost4
+		 dannum_cost4,
+		 dijia_cost1,
+		 dijia_cost2,
+		 dijia_cost3,
+		 dijia_cost4
 
 		From u_mattress
 		LEFT JOIN (
@@ -157,10 +161,14 @@
 		<field field="nottax_dept_cost" datatype="number">部门不含税价</field>
 		<field field="taxes" datatype="number">税金</field>
 		<field field="dept_cost" datatype="number">部门含税价</field>
-		<field field="dannum_cost1" datatype="number" usermode_notequals="1">散单金额</field>
-		<field field="dannum_cost2" datatype="number" usermode_notequals="1">标准金额</field>
-		<field field="dannum_cost3" datatype="number" usermode_notequals="1">大单金额</field>
-		<field field="dannum_cost4" datatype="number" usermode_notequals="1">小单金额</field>
+		<field field="dannum_cost1" datatype="number">部门售价-散单</field>
+		<field field="dannum_cost2" datatype="number">部门售价-标准</field>
+		<field field="dannum_cost3" datatype="number">部门售价-大单</field>
+		<field field="dannum_cost4" datatype="number">部门售价-小单</field>
+		<field field="dijia_cost1" datatype="number" usermode_notequals="1">不含税出厂价-散单</field>
+		<field field="dijia_cost2" datatype="number" usermode_notequals="1">不含税出厂价-标准</field>
+		<field field="dijia_cost3" datatype="number" usermode_notequals="1">不含税出厂价-大单</field>
+		<field field="dijia_cost4" datatype="number" usermode_notequals="1">不含税出厂价-小单</field>
 		<field field="foreign_cost" datatype="number">外币价</field>
 		<field field="packtype">包装方式</field>
 		<field field="cabinet_type" width="100">柜型</field>

JLHHJSvr/DataStore/web_mattress_extralist.xml

@@ -35,7 +35,7 @@
 		<field field="qty" datatype="number">数量</field>
 		<field field="dscrp">备注</field>
 		<field field="ifinit" datatype="checkbox">自动导入</field>
-		<field field="inputtype" mapper="">录入类型</field>
+		<field field="inputtype">录入类型</field>
 		<field field="inuse" datatype="checkbox">禁用</field>
 	</displayfields>
 </select>

JLHHJSvr/DataStore/web_mtrl_choose.xml

@@ -19,6 +19,7 @@
 		ISNULL(u_mtrl_price_pricelist.price, 0) AS pricelistprice,
 		ISNULL(u_mtrl_price_pricelist.price_formula, '') AS price_formula,
 		u_mtrl_price.erp_mtrlid,
+		u_mtrl_price.extra_cost,
 		SPACE(200) AS erp_mtrlcode,
 		SPACE(200) AS erp_mtrlname,
 		SPACE(200) AS erp_mtrlmode,
@@ -55,6 +56,7 @@
 		<field field="thickness">厚度</field>
 		<field field="priceunit">单位</field>
 		<field field="pricelistprice" funcid="96">单价</field>
+		<field field="extra_cost" datatype="number">特殊工艺费用</field>
 		<field field="dscrp" table="u_mtrl_price">备注</field>
 		<field field="erp_mtrlcode">L1编码</field>
 		<field field="erp_mtrlname">L1名称</field>

JLHHJSvr/Excutor/GetMtrlDefListExcutor.cs

@@ -53,6 +53,7 @@ namespace JLHHJSvr.Excutor
 		                            ,u_mtrl_price.handtype AS handtype
 		                            ,u_mtrl_price_pricelist.pricelistid
                                     ,u_mtrl_price.if_subspecs
+                                    ,u_mtrl_price.extra_cost
 	                            FROM u_mtrl_price
 	                            INNER JOIN u_mtrl_price_pricelist ON u_mtrl_price.mtrlid = u_mtrl_price_pricelist.mtrlid";
                 var list = new List<u_mtrl_price>();
@@ -76,7 +77,7 @@ namespace JLHHJSvr.Excutor
                     parms.Add("@keyword", "%" + request.keyword + "%");
                 }
 
-                var outputFields = "mtrlid,mtrltype,name,priceunit,shrinkage,gram_weight,cloth_width,if_inputqty,if_areaprice,createtime,createby,price,thickness,dscrp,erp_mtrlid,fjcnt,isuse,lastdate,handtype,pricelistid,if_subspecs";
+                var outputFields = "mtrlid,mtrltype,name,priceunit,shrinkage,gram_weight,cloth_width,if_inputqty,if_areaprice,createtime,createby,price,thickness,dscrp,erp_mtrlid,fjcnt,isuse,lastdate,handtype,pricelistid,if_subspecs,extra_cost";
                 DbSqlHelper.SelectJoin(cmd, selectStr, ListEx.GetWhereStr(whereList), parms, "mtrlid", outputFields, request.pageNum, request.pageSize, list);
 
                 // 

JLHHJSvr/Excutor/SaveMtrlDefExcutor.cs

@@ -55,7 +55,7 @@ namespace JLHHJSvr.Excutor
                             request.mtrl.createtime = dtNow;
                             request.mtrl.createby = tokendata.username;
 
-                            var fields = @"mtrlid,mtrltype,name,priceunit,shrinkage,gram_weight,cloth_width,if_inputqty,if_areaprice,createtime,createby,thickness,dscrp,erp_mtrlid,fjcnt,isuse,handtype,lastdate,erp_mtrlengname,if_subspecs";
+                            var fields = @"mtrlid,mtrltype,name,priceunit,shrinkage,gram_weight,cloth_width,if_inputqty,if_areaprice,createtime,createby,thickness,dscrp,erp_mtrlid,fjcnt,isuse,handtype,lastdate,erp_mtrlengname,if_subspecs,extra_cost";
                             DbSqlHelper.Insert(cmd, "u_mtrl_price", null, request.mtrl, fields);
 
                             var fields2 = @"mtrlid,pricelistid,price,pricetype,price_formula,qty_formula";
@@ -74,7 +74,7 @@ namespace JLHHJSvr.Excutor
                         else
                         {
                             //修改
-                            var fields = @"mtrltype,name,priceunit,shrinkage,gram_weight,cloth_width,if_inputqty,if_areaprice,thickness,dscrp,erp_mtrlid,fjcnt,isuse,handtype,lastdate,erp_mtrlengname,if_subspecs";
+                            var fields = @"mtrltype,name,priceunit,shrinkage,gram_weight,cloth_width,if_inputqty,if_areaprice,thickness,dscrp,erp_mtrlid,fjcnt,isuse,handtype,lastdate,erp_mtrlengname,if_subspecs,extra_cost";
                             DbSqlHelper.Update(cmd, "u_mtrl_price", null, request.mtrl, "mtrlid", fields);
 
                             var fields2 = @"price,pricetype,price_formula,qty_formula";

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -613,9 +613,9 @@ namespace JLHHJSvr.Helper
                     name_arr[3] = AppendToString(name_arr[3], SplitNameCount(mx.mtrlname, Convert.ToInt32(mx.qty.Value)));
                 }
 
-                if (mx.formulakind == 80 || mx.formulakind == 81 || mx.formulakind == 84)
+                if (mx.formulakind == 80 || mx.formulakind == 81 || mx.formulakind == 82 || mx.formulakind == 83 || mx.formulakind == 84)
                 {
-                    name_arr[0] = AppendToString(name_arr[0], mx.mtrlname);
+                    name_arr[0] = string.Format("{0}({1})", name_arr[0], mx.mtrlname);
                 }
             }
         }

JLHHJSvr/Helper/MattressHelper.cs

@@ -1593,7 +1593,7 @@ namespace JLHHJSvr.Helper
                 " if_z_chai, if_d_chai, if_n_butao, if_w_butao, if_m_wbutao_way, s_cover_qty, z_cover_qty, x_cover_qty, biandai_qty, s_m_cover_qty, z_m_cover_qty, x_m_cover_qty, chaizhuang_point, haimian_point, if_zhedie_type, qr_auditingrep, qr_auditingdate, if_bcp_type, zhizao_amt, foreign_cost_bz, " +
                 "cubage, extras_cost, extras_cost_dscrp, parentid, flag, xd_flag, dannum_type,dannum_cost1,dannum_cost2, dannum_cost3, dannum_cost4, dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4";
             var fieldsMx = "mattressmxid,mattressid,formulaid,formula,replace_formula,if_success,priceunit,shrinkage,mtrlid,price,gram_weight,cloth_width,if_inputqty,qty ,costamt,if_areaprice,thickness,chastr,xu,useqty,useformula,replace_useformula,gydscrp,mattress_width,mattress_length";
-            var fieldsExtra = "mattressmxid,mattressid, extraid, extramxid, extraname, price, qty, dscrp";
+            var fieldsExtra = "mattressmxid,mattressid, extraid, extramxid, extraname, price, qty, dscrp, mtrlid";
 
             mattress.qr_auditingdate = context.opdate;
             mattress.qr_auditingrep = context.tokendata.username;