1、修复床垫报价、床网报价：汇率改成币种，下拉读取问题

2、新增床垫额外费用定义表及其增删改查
3、修复部分枚举value值类型问题

JLHHJSvr/Com/DeleteMattressExtra.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.Com.Model;
+using LJLib.Net.SPI.Com;
+
+namespace JLHHJSvr.Com
+{
+    public sealed class DeleteMattressExtraRequest : ILJRequest<DeleteMattressExtraResponse>
+    {
+        public override string GetApiName()
+        {
+            return "DeleteMattressExtra";
+        }
+        /// <summary>
+        /// 登录token
+        /// </summary>
+        public string token { get; set; }
+        /// <summary>
+        /// 区域id
+        /// </summary>
+        public List<u_mattress_extra> list { get; set; }
+    }
+
+    public sealed class DeleteMattressExtraResponse : LJResponse
+    {
+    }
+}

JLHHJSvr/Com/GetMattressImportDW2.cs

@@ -35,5 +35,6 @@ namespace JLHHJSvr.Com
         /// </summary>
         public List<u_mattress_mx_mtrl> mattressMx { get; set; }
         public List<replacement> diancengarea { get; set; }
-}
+        public List<u_mattress_mx_extra> extraMx { get; set; }
+    }
 }

JLHHJSvr/Com/Model/u_dept.cs

@@ -77,5 +77,30 @@ namespace JLHHJSvr.Com.Model
         /// 禁用
         /// </summary>
         public byte? inuse { get; set; }
+        /// <summary>
+        /// 管理费用点
+        /// </summary>
+        public decimal? managerate { get; set; }
+        /// <summary>
+        /// 公司利润率
+        /// </summary>
+        public decimal? com_profitrate { get; set; }
+        /// <summary>
+        /// 散单利润率浮动数
+        /// </summary>
+        public decimal? dannum1_rate { get; set; }
+        /// <summary>
+        /// 标准利润率浮动数
+        /// </summary>
+        public decimal? dannum2_rate { get; set; }
+        /// <summary>
+        /// 大单利润率浮动数
+        /// </summary>
+        public decimal? dannum3_rate { get; set; }
+        /// <summary>
+        /// 小单利润率浮动数
+        /// </summary>
+        public decimal? dannum4_rate { get; set; }
+
     }
 }

JLHHJSvr/Com/Model/u_mattress_extra.cs

@@ -0,0 +1,49 @@
+using LJLib.DAL.SQL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    [PK(new[] { "extraid" })]
+    public sealed class u_mattress_extra
+    {/// <summary>
+     /// 项目id
+     /// </summary>
+        public int? extraid { get; set; }
+        /// <summary>
+        /// 项目类型名称
+        /// </summary>
+        public string extratypename { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string extraname { get; set; }
+        /// <summary>
+        /// 类型id
+        /// </summary>
+        public int? typeid { get; set; }
+        /// <summary>
+        /// 默认金额
+        /// </summary>
+        public decimal? price { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string dscrp { get; set; }
+        /// <summary>
+        /// 禁用
+        /// </summary>
+        public byte? inuse { get; set; }
+        /// <summary>
+        /// 录入类型
+        /// </summary>
+        public int? inputtype { get; set; }
+        /// <summary>
+        /// 自动导入
+        /// </summary>
+        public byte? ifinit { get; set; }
+
+    }
+}

JLHHJSvr/Com/Model/u_mattress_mx_extra.cs

@@ -0,0 +1,38 @@
+using LJLib.DAL.SQL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    [PK(new[] { "mattressmxid" })]
+    public sealed class u_mattress_mx_extra
+    {
+        /// <summary>
+        /// 床垫id
+        /// </summary>
+        public int? mattressid { get; set; }
+        /// <summary>
+        /// 明细id
+        /// </summary>
+        public int? mattressmxid { get; set; }
+        /// <summary>
+        /// 额外类目id
+        /// </summary>
+        public int? extraid { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string extraname { get; set; }
+        /// <summary>
+        /// 金额
+        /// </summary>
+        public decimal? price { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string dscrp { get; set; }
+
+    }
+}

JLHHJSvr/Com/Model/u_mattress_type.cs

@@ -104,6 +104,25 @@ namespace JLHHJSvr.Com.Model
         /// 管理费率
         /// </summary>
         public decimal? guanli_rate { get; set; }
-
+        /// <summary>
+        /// 款式系数
+        /// </summary>
+        public decimal? typerate { get; set; }
+        /// <summary>
+        /// 散单款式系数浮动数
+        /// </summary>
+        public decimal? dannum1_rate { get; set; }
+        /// <summary>
+        /// 标准款式系数浮动数
+        /// </summary>
+        public decimal? dannum2_rate { get; set; }
+        /// <summary>
+        /// 大单款式系数浮动数
+        /// </summary>
+        public decimal? dannum3_rate { get; set; }
+        /// <summary>
+        /// 小单款式系数浮动数
+        /// </summary>
+        public decimal? dannum4_rate { get; set; }
     }
 }

JLHHJSvr/Com/SaveMattressExtra.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.Com.Model;
+using LJLib.Net.SPI.Com;
+
+namespace JLHHJSvr.Com
+{
+    /// <summary>
+    /// 保存床垫额外费用定义
+    /// </summary>
+    public sealed class SaveMattressExtraRequest : ILJRequest<SaveMattressExtraResponse>
+    {
+        public override string GetApiName()
+        {
+            return "SaveMattressExtra";
+        }
+        public string token { get; set; }
+        /// <summary>
+        /// 床网分区定义
+        /// </summary>
+        public u_mattress_extra data { get; set; }
+    }
+
+    public sealed class SaveMattressExtraResponse : LJResponse
+    {
+    }
+}

JLHHJSvr/DataStore/_Mapper_deptid.xml

@@ -13,7 +13,7 @@ FROM u_dept
 	  <when notnull="@deptid">
 		  u_dept.deptid = @deptid
 	  </when>
-	  <when $user_deptstr!="0">
+	  <when $user_deptstr!="-1">
 		  u_dept.deptid IN ($$user_deptstr$$) OR u_dept.deptid = -1
 	  </when>
   </where>

JLHHJSvr/DataStore/_Mapper_formulatype.xml

@@ -3,39 +3,39 @@
 	<json>
 		[
 			{
-				"value": "0",
+				"value": 0,
 				"label": "面料"
 			},
 			{
-				"value": "1",
+				"value": 1,
 				"label": "垫层"
 			},
 			{
-				"value": "2",
+				"value": 2,
 				"label": "辅料"
 			},
 			{
-				"value": "3",
+				"value": 3,
 				"label": "包装"
 			},
 			{
-				"value": "4",
+				"value": 4,
 				"label": "杂料"
 			},
 			{
-				"value": "99",
+				"value": 99,
 				"label": "床网"
 			},
 			{
-				"value": "101",
+				"value": 101,
 				"label": "内布套"
 			},
 			{
-				"value": "103",
+				"value": 103,
 				"label": "顶布裥棉"
 			},
 			{
-				"value": "104",
+				"value": 104,
 				"label": "半成品"
 			}
 		]

JLHHJSvr/DataStore/_Mapper_if_moneyrate.xml

@@ -4,11 +4,11 @@
 		[
 			{
 				"label": "人民币",
-				"value": "0"
+				"value": 0
 			},
 			{
 				"label": "美元",
-				"value": "1"
+				"value": 1
 			}
 		]
 	</json>

JLHHJSvr/DataStore/_Mapper_if_mtrl.xml

@@ -4,15 +4,15 @@
 		[
 			{
 				"label": "无物料",
-				"value": "0"
+				"value": 0
 			},
 			{
 				"label": "单物料",
-				"value": "1"
+				"value": 1
 			},
 			{
 				"label": "多物料",
-				"value": "2"
+				"value": 2
 			}
 		]
 	</json>

JLHHJSvr/DataStore/_Mapper_mattressextra.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+  <selectstr>
+	SELECT u_mattress_extra.extraid,
+		u_mattress_extra.extratypename
+	FROM u_mattress_extra
+  </selectstr>
+  <where>
+	  <when notnull="@arg_typeid">
+		  typeid = @arg_typeid
+	  </when>
+  </where>
+  <displayfields>
+  </displayfields>
+</select>

JLHHJSvr/DataStore/_Mapper_usetype.xml

@@ -3,15 +3,15 @@
 	<json>
 		[
 			{
-				"value": "0",
+				"value": 0,
 				"label": "通用"
 			},
 			{
-				"value": "1",
+				"value": 1,
 				"label": "按床垫类别"
 			},
 			{
-				"value": "2",
+				"value": 2,
 				"label": "按包装方式"
 			}
 		]

JLHHJSvr/DataStore/web_bednet_define.xml

@@ -115,6 +115,7 @@
 		u_bednet.taxrate,
 		u_bednet.extras_cost,
 		u_bednet.moneyrate,
+		CASE WHEN u_bednet.moneyrate = 1 THEN 0 ELSE 1 END AS if_moneyrate,
 		u_bednet.spring_hr_formula,
 		u_bednet.cnail_weight_formula,
 		u_bednet.edge_weight_formula,
@@ -281,7 +282,7 @@
 		<field field="fob">FOB</field>
 		<field field="taxrate">税率</field>
 		<field field="extras_cost">额外费用</field>
-		<field field="moneyrate">汇率</field>
+		<field field="moneyrate" mapper="u_mattress.if_moneyrate">币种</field>
 		<field field="extras_cost_dscrp">额外费用备注</field>
 		<field field="duo_qv_str" mapper="u_bednet.bednet_area">多区</field>
 	</displayfields>

JLHHJSvr/DataStore/web_deptlist.xml

@@ -18,6 +18,12 @@ SELECT u_dept.deptid
 	,u_dept.manage_amt
 	,u_dept.mtrltype
 	,u_dept.inuse
+	,u_dept.managerate
+	,u_dept.com_profitrate
+	,u_dept.dannum1_rate
+	,u_dept.dannum2_rate
+	,u_dept.dannum3_rate
+	,u_dept.dannum4_rate
 FROM u_dept
   </selectstr>
   <where>
@@ -41,6 +47,11 @@ FROM u_dept
 	<field field="auditdate">审核时间</field>
 	<field field="manage_amt">部门管理费</field>
 	<field field="mtrltype">默认物料类别</field>
-	<field field="inuse" datatype="checkbox">禁用</field>
+	<field field="managerate">管理费用点</field>
+	<field field="com_profitrate">公司利润率</field>
+	<field field="dannum1_rate">标准</field>
+	<field field="dannum2_rate">散单</field>
+	<field field="dannum3_rate">大单</field>
+	<field field="dannum4_rate">小单</field>
   </displayfields>
 </select>

JLHHJSvr/DataStore/web_mattress.xml

@@ -157,7 +157,7 @@
 		<field field="yongjin" datatype="number" compute="dijia_cost / (1 - (commission - 1 )) - dijia_cost">佣金</field>
 		<field field="taxrate" datatype="number">税率</field>
 		<field field="fob" datatype="number">FOB</field>
-		<field field="moneyrate" mapper="u_mattress.if_moneyrate">汇率</field>
+		<field field="moneyrate" mapper="u_mattress.if_moneyrate">币种</field>
 		<field field="createby">登记人</field>
 		<field field="createtime" datatype="datetime">登记时间</field>
 		<field field="auditingrep">审核人</field>

JLHHJSvr/DataStore/web_mattress_extralist.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+			extraid
+			,extratypename
+			,extraname
+			,typeid
+			,price
+			,dscrp
+			,inuse
+			,inputtype
+			,ifinit
+		From u_mattress_extra
+	</selectstr>
+	<where>
+		<when notnull="@arg_typeid">
+			u_mattress_extra.typeid = @arg_typeid
+		</when>
+		<when notnull="@arg_ifinit">
+			u_mattress_extra.arg_ifinit = @arg_ifinit
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()">序</field>
+		<field field="extratypename" mapper="u_mattress_extra.mattressextra">项目类型</field>
+		<field field="extraname">项目名称</field>
+		<field field="price" datatype="number">金额</field>
+		<field field="dscrp">备注</field>
+		<field field="ifinit" datatype="checkbox">自动导入</field>
+		<field field="inuse" datatype="checkbox">禁用</field>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/web_mattress_mx_extra.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+			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,
+			'+' 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
+	</selectstr>
+	<where>
+		<when notnull="@arg_mattressid" arg_mattressid!="0">
+			u_mattress_mx_extra.mattressid = @arg_mattressid
+		</when>
+		<when notnull="@arg_typeid">
+			u_mattress_extra.typeid = @arg_typeid
+		</when>
+		<when notnull="@arg_ifinit">
+			u_mattress_extra.ifinit = @arg_ifinit
+		</when>
+	</where>
+	<displayfields>
+		<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="extraname">项目名称</field>
+		<field field="price" datatype="number">金额</field>
+		<field field="dscrp">备注</field>
+	</displayfields>
+</select>

JLHHJSvr/DataStore/web_mattress_typelist.xml

@@ -26,6 +26,11 @@ SELECT mattresstypeid
 	,guanli_rate
 	,createtime
 	,createby
+	,typerate
+	,dannum1_rate
+	,dannum2_rate
+	,dannum3_rate
+	,dannum4_rate
 FROM u_mattress_type
   </selectstr>
   <where>
@@ -59,5 +64,10 @@ FROM u_mattress_type
 	<field field="if_v_side3" datatype="checkbox">V侧裥面3</field>
 	<field field="zhizao_amt">制造费用</field>
 	<field field="guanli_rate">管理费率</field>
+	<field field="typerate">款式系数</field>
+	<field field="dannum1_rate">标准系数浮动</field>
+	<field field="dannum2_rate">散单系数浮动</field>
+	<field field="dannum3_rate">大单系数浮动</field>
+	<field field="dannum4_rate">小单系数浮动</field>
   </displayfields>
 </select>

JLHHJSvr/Excutor/DeleteMattressExtraExcutor.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Data.SqlClient;
+using System.Linq;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.LJException;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class DeleteMattressExtraExcutor : ExcutorBase<DeleteMattressExtraRequest, DeleteMattressExtraResponse>
+    {
+        protected override void ExcuteInternal(DeleteMattressExtraRequest request, object state, DeleteMattressExtraResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断，请重新登录";
+                return;
+            }
+            if (!request.list.Any())
+            {
+                rslt.ErrMsg = "至少提交一条需要删除的记录";
+                return;
+            }
+
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
+            {
+                con.Open();
+
+                using (cmd.Transaction = con.BeginTransaction())
+                {
+                    try
+                    {
+                        foreach (var area in request.list)
+                        {
+                            if (DbSqlHelper.Delete(cmd, area) == 0)
+                            {
+                                throw new LJCommonException($"床垫额外费用类型定义资料不存在");
+                            }
+                        }
+
+                        cmd.Transaction.Commit();
+                    }
+                    catch (Exception e)
+                    {
+                        cmd.Transaction.Rollback();
+                        rslt.ErrMsg = e.ToString();
+                    }
+                }
+            }
+        }
+    }
+}

JLHHJSvr/Excutor/GetMattressImportDW2Excutor.cs

@@ -252,6 +252,45 @@ namespace JLHHJSvr.Excutor
                         }
 
                         rslt.mattressMx = dw_2;
+
+                        #region 导入其他额外费用和特殊工艺
+
+                        selectStr = @"
+                                SELECT
+			                        extraid
+			                        ,extratypename
+			                        ,extraname
+			                        ,typeid
+			                        ,price
+			                        ,dscrp
+			                        ,inuse
+			                        ,inputtype
+			                        ,ifinit
+		                        From u_mattress_extra";
+                        outFields = "extraid,extratypename,extraname,typeid,price,dscrp,inuse,inputtype,ifinit";
+                        whereList = new List<string>();
+                        whereList.Add("u_mattress_extra.ifinit = 1");
+                        param = new Dictionary<string, object>();
+
+                        //   导入 0-通用类型  的公式
+                        var mattressExtra = new List<u_mattress_extra>();
+                        DbSqlHelper.SelectJoin(cmd, selectStr, ListEx.GetWhereStr(whereList), param, "typeid, extraid", outFields, 0, 0, mattressExtra);
+
+                        rslt.extraMx = new List<u_mattress_mx_extra>();
+                        foreach (var mx in mattressExtra)
+                        {
+                            u_mattress_mx_extra mxItem = new u_mattress_mx_extra
+                            {
+                                mattressid = 0,
+                                mattressmxid = 0,
+                                extraid = mx.extraid,
+                                extraname = mx.extraname,
+                                dscrp = mx.dscrp,
+                                price = mx.price
+                            };
+                            rslt.extraMx.Add(mxItem);
+                        }
+                        #endregion
                     }
 
                 }

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";
+                            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";
                             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";
+                            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";
                             DbSqlHelper.Update(cmd, "u_dept", null, request.dept, "deptid", fields);
                         }
 

JLHHJSvr/Excutor/SaveMattressExtraExcutor.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.LJException;
+using JLHHJSvr.Tools;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class SaveMattressExtraExcutor : ExcutorBase<SaveMattressExtraRequest, SaveMattressExtraResponse>
+    {
+        protected override void ExcuteInternal(SaveMattressExtraRequest request, object state, SaveMattressExtraResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断，请重新登录";
+                return;
+            }
+
+            if (request.data == null)
+            {
+                rslt.ErrMsg = "未提交数据定义";
+                return;
+            }
+
+            if (string.IsNullOrEmpty(request.data.extratypename))
+            {
+                rslt.ErrMsg = "请填写项目类型名称";
+                return;
+            }
+
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
+            {
+                con.Open();
+
+                var dtNow = DateTime.Now;
+
+                AutoInit.AutoInitS(cmd, request.data);
+
+                using (cmd.Transaction = con.BeginTransaction())
+                {
+                    try
+                    {
+                        var fields = "extratypename,extraname,typeid,price,dscrp,inuse,ifinit,inputtype";
+                        if (request.data.extraid <= 0)
+                        {
+                            request.data.extraid = BllHelper.GetID(cmd, "u_mattress_extra");
+
+                            DbSqlHelper.Insert(cmd, "u_mattress_extra", null, request.data, "extraid," + fields);
+                        }
+                        else
+                        {
+                            //修改
+                            DbSqlHelper.Update(cmd, "u_mattress_extra", null, request.data, "extraid", fields);
+                        }
+
+                        cmd.Transaction.Commit();
+                    }
+                    catch (Exception e)
+                    {
+                        cmd.Transaction.Rollback();
+                        rslt.ErrMsg = e.ToString();
+                    }
+                }
+            }
+        }
+    }
+}

JLHHJSvr/Excutor/SaveMattressTypeExcutor.cs

@@ -64,7 +64,7 @@ namespace JLHHJSvr.Excutor
                             var fields = @"mattresstypeid,typecode,typename,if_top_side,if_button_sdie,if_big_side,formula_big_side,if_small_side,
                                         formula_small_side,if_v_side,formula_v_side,if_in_cloth_cover,if_out_cloth_cover,biandaiqty,hrcost_formula,dianceng_sort,
                                         dianceng_area,if_small_side2,if_small_side3,if_v_side2,if_v_side3,formula_big_side,formula_small_side,formula_v_side,
-                                        zhizao_amt,guanli_rate,createtime,createby";
+                                        zhizao_amt,guanli_rate,createtime,createby,typerate,dannum1_rate,dannum2_rate,dannum3_rate,dannum4_rate";
                             DbSqlHelper.Insert(cmd, "u_mattress_type", null, request.mattress, fields);
                         }
                         else
@@ -73,7 +73,7 @@ namespace JLHHJSvr.Excutor
                             var fields = @"typecode,typename,if_top_side,if_button_sdie,if_big_side,formula_big_side,if_small_side,
                                         formula_small_side,if_v_side,formula_v_side,if_in_cloth_cover,if_out_cloth_cover,biandaiqty,hrcost_formula,dianceng_sort,
                                         dianceng_area,if_small_side2,if_small_side3,if_v_side2,if_v_side3,formula_big_side,formula_small_side,formula_v_side,
-                                        zhizao_amt,guanli_rate";
+                                        zhizao_amt,guanli_rate,typerate,dannum1_rate,dannum2_rate,dannum3_rate,dannum4_rate";
                             DbSqlHelper.Update(cmd, "u_mattress_type", null, request.mattress, "mattresstypeid", fields);
                         }
 

JLHHJSvr/GlobalVar/GlobalVar.cs

@@ -224,6 +224,9 @@ namespace JLHHJSvr
                 //excutorManager.AddMap("GetSemiFinishedMxList", typeof(GetSemiFinishedMxListRequest), new GetSemiFinishedMxListExcutor());// 获取产品清单明细
 
                 //excutorManager.AddMap("ImportSpring", typeof(ImportSpringRequest), new ImportSpringExcutor());
+                excutorManager.AddMap("SaveMattressExtra", typeof(SaveMattressExtraRequest), new SaveMattressExtraExcutor());// 保存床网分区定义
+                excutorManager.AddMap("DeleteMattressExtra", typeof(DeleteMattressExtraRequest), new DeleteMattressExtraExcutor());// 删除床网分区定义
+
             }
             catch (Exception ex)
             {

JLHHJSvr/JLHHJSvr.csproj

@@ -99,6 +99,10 @@
     <Compile Include="Com\CommonDynamicSelect.cs" />
     <Compile Include="Com\CopyMattressAudited.cs" />
     <Compile Include="Com\CopyMtrlDef.cs" />
+    <Compile Include="Com\DeleteMattressExtra.cs" />
+    <Compile Include="Com\Model\u_mattress_extra.cs" />
+    <Compile Include="Com\Model\u_mattress_mx_extra.cs" />
+    <Compile Include="Com\SaveMattressExtra.cs" />
     <Compile Include="Com\UpdateMtrlPrice.cs" />
     <Compile Include="Com\DelCarList.cs" />
     <Compile Include="Com\DeleteBedNet.cs" />
@@ -281,6 +285,8 @@
     <Compile Include="Excutor\CommonDynamicSelectExcutor.cs" />
     <Compile Include="Excutor\CopyMattressAuditedExcutor.cs" />
     <Compile Include="Excutor\CopyMtrlDefExcutor.cs" />
+    <Compile Include="Excutor\DeleteMattressExtraExcutor.cs" />
+    <Compile Include="Excutor\SaveMattressExtraExcutor.cs" />
     <Compile Include="Excutor\UpdateMtrlPriceExcutor.cs" />
     <Compile Include="Excutor\DelMtrlPfExcutor.cs" />
     <Compile Include="Excutor\DelCarListExcutor.cs" />