核价后台： 1、部门表新增非报关产品税金补偿；2、增加骨条分类；

JLHHJSvr/Com/Model/u_dept.cs

@@ -101,6 +101,10 @@ namespace JLHHJSvr.Com.Model
         /// 小单利润率浮动数
         /// </summary>
         public decimal? dannum4_rate { get; set; }
+        /// <summary>
+        /// 非报关产品税金补偿
+        /// </summary>
+        public decimal? taxes_rate { get; set; }
 
     }
 }

JLHHJSvr/DataStore/_Mapper_formulakind.xml

@@ -262,6 +262,10 @@
 				"label": "车花边",
 				"value": 205
 			},
+			{
+				"label": "骨条",
+				"value": 206
+			},
 			{
 				"label": "床网",
 				"value": 99

JLHHJSvr/DataStore/web_deptlist.xml

@@ -24,6 +24,7 @@ SELECT u_dept.deptid
 	,u_dept.dannum2_rate
 	,u_dept.dannum3_rate
 	,u_dept.dannum4_rate
+	,u_dept.taxes_rate
 FROM u_dept
   </selectstr>
   <where>
@@ -53,5 +54,6 @@ FROM u_dept
 	<field field="dannum2_rate">散单</field>
 	<field field="dannum3_rate">大单</field>
 	<field field="dannum4_rate">小单</field>
+	<field field="taxes_rate">非报关产品税金补偿</field>
   </displayfields>
 </select>

JLHHJSvr/DataStore/web_mattress_mx_neibutao.xml

@@ -25,6 +25,10 @@
 			u_mattress_mx_mtrl.shrinkage,
 			CASE when u_mattress_formula.if_mtrl > 1 THEN '+' ELSE '' END as addmx,
 			CASE when u_mattress_formula.if_mtrl > 1 THEN '-' ELSE '' END as delmx,
+			ISNULL(u_mtrltype.dannum1_rate, 0) AS dannum1_rate,
+			ISNULL(u_mtrltype.dannum2_rate, 0) AS dannum2_rate,
+			ISNULL(u_mtrltype.dannum3_rate, 0) AS dannum3_rate,
+			ISNULL(u_mtrltype.dannum4_rate, 0) AS dannum4_rate,
 			u_mtrl_price.name,
 			u_mattress_mx_mtrl.thickness,
 			u_mattress_mx_mtrl.chastr,
@@ -38,6 +42,7 @@
 		From u_mattress_mx_mtrl
 		Left JOIN u_mattress_formula On u_mattress_formula.formulaid = u_mattress_mx_mtrl.formulaid left outer join u_mtrl_price on
 			u_mattress_mx_mtrl.mtrlid = u_mtrl_price.mtrlid
+		left outer join u_mtrltype on u_mtrltype.mtrltypeid = u_mtrl_price.mtrltype
 		Left OUTER JOIN (
 			select
 				mtrlid,
@@ -94,6 +99,22 @@
 			成本
 			金额
 		</field>
+		<field field="dannum1_rate" datatype="number" onlyusermode="0">
+			散单
+			成本金额
+		</field>
+		<field field="dannum2_rate" datatype="number" onlyusermode="0">
+			标准
+			成本金额
+		</field>
+		<field field="dannum3_rate" datatype="number" onlyusermode="0">
+			大单
+			成本金额
+		</field>
+		<field field="dannum4_rate" datatype="number" onlyusermode="0">
+			小单
+			成本金额
+		</field>
 		<field field="formula" onlyusermode="0">
 			金额文本
 			公式

JLHHJSvr/Excutor/SaveDeptExcutor.cs

@@ -70,7 +70,7 @@ namespace JLHHJSvr.Excutor
                             request.dept.createtime = dtNow;
                             request.dept.deptid = BllHelper.GetID(cmd, "u_dept");
                             
-                            var fields = "deptid,deptname,profitrate,pricelistid,springtypeid,createtime,moneyrate,discount,flag,if_rate_auto,manage_amt,mtrltype,managerate,com_profitrate,dannum1_rate,dannum2_rate,dannum3_rate,dannum4_rate";
+                            var fields = "deptid,deptname,profitrate,pricelistid,springtypeid,createtime,moneyrate,discount,flag,if_rate_auto,manage_amt,mtrltype,managerate,com_profitrate,dannum1_rate,dannum2_rate,dannum3_rate,dannum4_rate,taxes_rate";
                             DbSqlHelper.Insert(cmd, "u_dept", null, request.dept, fields);
                         }
                         else
@@ -79,7 +79,7 @@ namespace JLHHJSvr.Excutor
                             request.dept.moddate = dtNow;
                             request.dept.modemp = tokendata.username;
 
-                            var fields = "deptname,profitrate,pricelistid,springtypeid,moneyrate,discount,flag,if_rate_auto,manage_amt,mtrltype,moddate,modemp,managerate,com_profitrate,dannum1_rate,dannum2_rate,dannum3_rate,dannum4_rate";
+                            var fields = "deptname,profitrate,pricelistid,springtypeid,moneyrate,discount,flag,if_rate_auto,manage_amt,mtrltype,moddate,modemp,managerate,com_profitrate,dannum1_rate,dannum2_rate,dannum3_rate,dannum4_rate,taxes_rate";
                             DbSqlHelper.Update(cmd, "u_dept", null, request.dept, "deptid", fields);
                         }
 

JLHHJSvr/Excutor/SaveMtrlTypeExcutor.cs

@@ -54,7 +54,7 @@ namespace JLHHJSvr.Excutor
                 {
                     try
                     {
-                        if (request.mtrltype.mtrltypeid <= 0)
+                        if (request.mtrltype.mtrltypeid < 0)
                         {
                             request.mtrltype.mtrltypeid = BllHelper.GetID(cmd, "u_mtrltype");