Browse Source

业务后台代码更新

chen_yjin 6 months ago
parent
commit
a7709d10c4

+ 4 - 0
JLHHJSvr/BLL/TokenData.cs

@@ -3,6 +3,10 @@ namespace JLHHJSvr.BLL
 {
 {
     internal sealed class TokenData
     internal sealed class TokenData
     {
     {
+        /// <summary>
+        /// id
+        /// </summary>
+        public int empid { get; set; }
         /// <summary>
         /// <summary>
         /// 用户ID
         /// 用户ID
         /// </summary>
         /// </summary>

+ 13 - 3
JLHHJSvr/BLL/UserHelper.cs

@@ -124,9 +124,19 @@ namespace JLHHJSvr.BLL
         //    }
         //    }
         //}
         //}
 
 
-
-
-
+        public static bool CheckFuncPower(SqlCommand cmd, int empid, int funcid)
+        {
+            if (empid == 0)
+            {
+                return true;
+            }
+            var user = new u_user_jlhprice() { empid = empid };
+            if (DbSqlHelper.SelectOne(cmd, user, "empid,rightstring") != 1)
+            {
+                throw new Exception(string.Format("查询用户信息失败,empid:{0}", empid));
+            }
+            return HasPower(funcid, user.rightstring);
+        }
         private static bool HasPower(int funcid, string sys_pwrstr)
         private static bool HasPower(int funcid, string sys_pwrstr)
         {
         {
             bool hasPower;
             bool hasPower;

+ 26 - 0
JLHHJSvr/Com/DelMattress.cs

@@ -0,0 +1,26 @@
+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 DelMattressRequest : ILJRequest<DelMattressResponse>
+    {
+        public string GetApiName()
+        {
+            return "DelMattress";
+        }
+        public string token { get; set; }
+        public List<int> mattressids { get; set; }
+    }
+
+    public sealed class DelMattressResponse : LJResponse
+    {
+    }
+}

+ 23 - 0
JLHHJSvr/Com/Model/u_his_price.cs

@@ -0,0 +1,23 @@
+using LJLib.DAL.SQL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    public sealed class u_his_price
+    {
+        public int? bednetid_mattressid { get; set; }
+        /// <summary>
+        /// 1: 床垫报价,0:床网报价
+        /// </summary>
+        public int? typeid { get; set; }
+        public DateTime? cmpdate { get; set; }
+        public string cmpemp { get; set; }
+        public decimal? nottax_dept_cost { get; set; }
+        public decimal? dept_cost { get; set; }
+        public decimal? foreign_cost { get; set; }
+
+    }
+}

+ 2 - 30
JLHHJSvr/Com/SaveMattress.cs

@@ -22,37 +22,9 @@ namespace JLHHJSvr.Com
         /// </summary>
         /// </summary>
         public u_mattress mattress { get; set; }
         public u_mattress mattress { get; set; }
         /// <summary>
         /// <summary>
-        /// 面料
+        /// 所有明细
         /// </summary>
         /// </summary>
-        public List<u_mattress_mx_mtrl> mianliao { get; set; }
-        /// <summary>
-        /// 垫层
-        /// </summary>
-        public List<u_mattress_mx_mtrl> dianceng { get; set; }
-        /// <summary>
-        /// 辅料
-        /// </summary>
-        public List<u_mattress_mx_mtrl> fuliao { get; set; }
-        /// <summary>
-        /// 包装
-        /// </summary>
-        public List<u_mattress_mx_mtrl> baozhuang { get; set; }
-        /// <summary>
-        /// 杂料
-        /// </summary>
-        public List<u_mattress_mx_mtrl> zaliao { get; set; }
-        /// <summary>
-        /// 床网
-        /// </summary>
-        public List<u_mattress_mx_mtrl> chuangwang { get; set; }
-        /// <summary>
-        /// 内布套
-        /// </summary>
-        public List<u_mattress_mx_mtrl> neibutao { get; set; }
-        /// <summary>
-        /// 外布套
-        /// </summary>
-        public List<u_mattress_mx_mtrl> waibutao { get; set; }
+        public List<u_mattress_mx_mtrl> mattressMx { get; set; }
     }
     }
 
 
     public sealed class SaveMattressResponse : LJResponse
     public sealed class SaveMattressResponse : LJResponse

+ 34 - 0
JLHHJSvr/Com/SaveMattressAuditing.cs

@@ -0,0 +1,34 @@
+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 SaveMattressAuditingRequest : ILJRequest<SaveMattressAuditingResponse>
+    {
+        public string GetApiName()
+        {
+            return "SaveMattressAuditing";
+        }
+        public string token { get; set; }
+        public List<int> mattressids { get; set; }
+        /// <summary>
+        /// 0: 取消,1:下单
+        /// </summary>
+        public int? xd_flag { get; set; }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        public int? flag { get; set; }
+    }
+
+    public sealed class SaveMattressAuditingResponse : LJResponse
+    {
+    }
+}

+ 14 - 0
JLHHJSvr/DataStore/_Mapper_chastr_dc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT  top 0
+		u_mtrl_price.name
+		FROM u_mtrl_price
+		WHERE u_mtrl_price.mtrltype = 2
+
+	</selectstr>
+	<where>
+	</where>
+	<displayfields>
+	</displayfields>
+</select>

+ 35 - 0
JLHHJSvr/DataStore/_Mapper_formulakind_dc.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<data>
+	<json>
+		[
+			{
+				"value": "32",
+				"label": "垫层"
+			},
+			{
+				"value": "999",
+				"label": "床网_"
+			},
+			{
+				"value": "12",
+				"label": "顶布"
+			},
+			{
+				"value": "1201",
+				"label": "顶布裥棉"
+			},
+			{
+				"value": "13",
+				"label": "毡类"
+			},
+			{
+				"value": "14",
+				"label": "打底无纺布"
+			},
+			{
+				"value": "29",
+				"label": "网面布料"
+			}
+		]
+	</json>
+</data>

+ 73 - 0
JLHHJSvr/DataStore/web_bednet.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		SELECT
+		flag,
+		deptid ,
+		bednettypeid,
+		bednetcode
+
+		From u_bednet
+	</selectstr>
+	<where>
+		<when notnull="@arg_bednetid">
+			u_bednet.bednetid = @arg_bednetid
+		</when>
+	</where>
+	<displayfields>
+		<field field="pid" compute="getrow()">序</field>
+		<field field="xd_flag" datatype="checkbox">下单</field>
+		<field field="js1_flag" datatype="checkbox">产品补充审核</field>
+		<field field="flag" datatype="checkbox">财务审核</field>
+		<field field="deptid" mapper="" ddd="ddd_mattress_dept_choose" align="left">部门</field>
+		<field field="mattresscode">报价唯一码</field>
+		<field field="mattressrelcode">床垫编码</field>
+		<field field="mattressname">床垫名称</field>
+		<field field="mattresstypeid" mapper="" ddd="ddd_mattress_type_choose">床垫类别</field>
+		<field field="erp_mtrlcode">L1物料编码</field>
+		<field field="mattress_width" datatype="number">床垫宽/CM</field>
+		<field field="mattress_length" datatype="number">床垫长/CM</field>
+		<field field="mattress_height" datatype="number">床垫高/CM</field>
+		<field field="total_cost" datatype="number">总成本</field>
+		<field field="nottax_factory_cost" datatype="number">不含税出厂价</field>
+		<field field="nottax_dept_cost" datatype="number">部门不含税价</field>
+		<field field="taxes" datatype="number">税金</field>
+		<field field="dept_cost" datatype="number">部门含税价</field>
+		<field field="foreign_cost" datatype="number">外币价</field>
+		<field field="packtype" datatype="checkbox">包装方式</field>
+		<field field="packqty" datatype="number">压包数量</field>
+		<field field="woodpallettype" datatype="checkbox">木托方式</field>
+		<field field="dijia_cost" datatype="number">底价</field>
+		<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="createby">登记人</field>
+		<field field="createtime" datatype="datetime">登记时间</field>
+		<field field="auditingrep">审核人</field>
+		<field field="auditingdate" datatype="datetime">审核时间</field>
+		<field field="mattressid">Mattressid</field>
+		<field field="xd_auditingrep">下单人</field>
+		<field field="xd_auditingdate" datatype="datetime">下单时间</field>
+		<field field="qr_auditingrep">更新人</field>
+		<field field="qr_auditingdate" datatype="datetime">最新更新日期</field>
+		<field field="erp_cb_updatetime" datatype="datetime">erp成本更新时间</field>
+		<field field="dept_profitrate" datatype="number">部门让利点数</field>
+		<field field="fees_dscrp">额外费用说明</field>
+		<field field="commission">佣金点数</field>
+		<field field="other_rate">额外点数</field>
+		<field field="extras_cost">额外费用</field>
+		<field field="if_bcp_type" datatype="checkbox">半成品</field>
+		<field field="if_w_butao" datatype="checkbox">顶布裥棉</field>
+		<field field="biandai_qty" datatype="number">边带数</field>
+		<field field="if_m_chai" datatype="checkbox">面拆</field>
+		<field field="if_n_butao" datatype="checkbox">内布套</field>
+		<field field="s_cover_qty" datatype="number">内布套上覆</field>
+		<field field="z_cover_qty" datatype="number">内布套侧覆</field>
+		<field field="x_cover_qty" datatype="number">内布套下覆</field>
+		<field field="if_m_wbutao_way" datatype="checkbox">面料外布套做法</field>
+		<field field="s_m_cover_qty" datatype="number">面层向大侧覆盖</field>
+		<field field="z_m_cover_qty" datatype="number">大侧向底层覆盖</field>
+		<field field="x_m_cover_qty" datatype="number">底层向大侧覆盖</field>
+	</displayfields>
+</select>

+ 32 - 0
JLHHJSvr/DataStore/web_his_price.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+	<selectstr>
+		select
+			bednetid_mattressid,
+			cmpdate,
+			cmpemp,
+			nottax_dept_cost,
+			dept_cost,
+			foreign_cost
+		from u_his_price
+	</selectstr>
+	<where>
+		<when notnull="@arg_id">
+			bednetid_mattressid = @arg_id
+		</when>
+		<when notnull="@arg_typeid">
+			typeid = @arg_typeid
+		</when>
+	</where>
+	<orderstr>
+		cmpdate DESC
+	</orderstr>
+	<displayfields>
+		<field field="pid" compute="getrow()">序</field>
+		<field field="cmpdate" datatype="datetime">重算日期</field>
+		<field field="cmpemp">重算人</field>
+		<field field="nottax_dept_cost" datatype="number">不含税部门价</field>
+		<field field="dept_cost" datatype="number">含税部门价</field>
+		<field field="foreign_cost" datatype="number">外币价</field>
+	</displayfields>
+</select>

+ 5 - 1
JLHHJSvr/DataStore/web_mattress.xml

@@ -75,7 +75,11 @@
 		x_cover_qty,
 		x_cover_qty,
 		s_m_cover_qty,
 		s_m_cover_qty,
 		z_m_cover_qty,
 		z_m_cover_qty,
-		x_m_cover_qty
+		x_m_cover_qty,
+		cabinet_type,
+		area,
+		diameter,
+		cubage
 
 
 		From u_mattress
 		From u_mattress
 	</selectstr>
 	</selectstr>

+ 83 - 0
JLHHJSvr/Excutor/DelMattressExcutor.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.LJException;
+using JLHHJSvr.Tools;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class DelMattressExcutor : ExcutorBase<DelMattressRequest, DelMattressResponse>
+    {
+        protected override void ExcuteInternal(DelMattressRequest request, object state, DelMattressResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断,请重新登录";
+                return;
+            }
+
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
+            {
+                con.Open();
+
+                // 初始化属性
+                //AutoInit.AutoInitS(cmd, request.mattress);
+
+                using (cmd.Transaction = con.BeginTransaction())
+                {
+                    try
+                    {
+                        var power77 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 77);
+                        if (!power77)
+                        {
+                            throw new LJCommonException("你没有删除权限");
+                        }
+
+                        foreach (int itemid in request.mattressids)
+                        {
+                            var mattressInfo = new u_mattress() { mattressid = itemid };
+                            if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, js1_flag") != 1)
+                            {
+                                rslt.ErrMsg = "查找报价单据失败:" + itemid;
+                                return;
+                            }
+
+                            if (mattressInfo.flag == 1)
+                            {
+                                rslt.ErrMsg = "床垫已审核,不能删除!(" + itemid + ")";
+                                return;
+                            }
+                            if (mattressInfo.js1_flag == 1)
+                            {
+                                rslt.ErrMsg = "资料已技术审核不能删除!(" + itemid + ")";
+                                return;
+                            }
+
+                            if (DbSqlHelper.Delete(cmd, mattressInfo) <= 0)
+                            {
+                                throw new LJCommonException("因网络或其它原因,删除床垫报价操作失败!");
+                            }
+
+                        }
+
+                        cmd.Transaction.Commit();
+                    }
+                    catch (Exception e)
+                    {
+                        cmd.Transaction.Rollback();
+                        rslt.ErrMsg = e.ToString();
+                    }
+                }
+            }
+        }
+    }
+}

+ 1 - 0
JLHHJSvr/Excutor/LoginExcutor.cs

@@ -62,6 +62,7 @@ namespace JLHHJSvr.Excutor
             rslt.usermode = stUser.usermode;
             rslt.usermode = stUser.usermode;
             var tokenData = new TokenData
             var tokenData = new TokenData
             {
             {
+                empid = stUser.empid,
                 usercode = stUser.userid,
                 usercode = stUser.userid,
                 userid = stUser.empid,
                 userid = stUser.empid,
                 username = stUser.username,
                 username = stUser.username,

+ 197 - 0
JLHHJSvr/Excutor/SaveMattressAuditingExcutor.cs

@@ -0,0 +1,197 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.LJException;
+using JLHHJSvr.Tools;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class SaveMattressAuditingExcutor : ExcutorBase<SaveMattressAuditingRequest, SaveMattressAuditingResponse>
+    {
+        protected override void ExcuteInternal(SaveMattressAuditingRequest request, object state, SaveMattressAuditingResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断,请重新登录";
+                return;
+            }
+
+            using (var con = new SqlConnection(GlobalVar.ConnectionString))
+            using (var cmd = con.CreateCommand())
+            {
+                con.Open();
+
+                // 初始化属性
+                //AutoInit.AutoInitS(cmd, request.mattress);
+
+                using (cmd.Transaction = con.BeginTransaction())
+                {
+                    try
+                    {
+
+                        if (request.xd_flag != null)
+                        {
+                            // 业务下单/取消
+
+                            var power94 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 94);
+                            if (!power94 && request.xd_flag == 1)
+                            {
+                                throw new LJCommonException("你没有业务下单权限");
+                            }
+
+                            var power95 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 95);
+                            if (!power95 && request.xd_flag == 0)
+                            {
+                                throw new LJCommonException("你没有取消业务下单权限");
+                            }
+
+
+                            var updateField = "xd_flag, xd_auditingrep, xd_auditingdate";
+
+                            foreach (int itemid in request.mattressids)
+                            {
+                                var mattressInfo = new u_mattress() { mattressid = itemid };
+                                if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag, xd_flag") != 1)
+                                {
+                                    rslt.ErrMsg = "查找报价单据失败:" + itemid;
+                                    return;
+                                }
+
+                                if (request.xd_flag == 1)
+                                {
+                                    if (mattressInfo.flag == 1)
+                                    {
+                                        rslt.ErrMsg = "床垫已审核,不能业务下单!(" + itemid + ")";
+                                        return;
+                                    }
+                                    if (mattressInfo.xd_flag == 1)
+                                    {
+                                        rslt.ErrMsg = "床垫已完成业务下单(" + itemid + ")";
+                                        return;
+                                    }
+
+                                    mattressInfo.xd_flag = 1;
+                                    mattressInfo.xd_auditingrep = tokendata.username;
+                                    mattressInfo.xd_auditingdate = DateTime.Now;
+
+
+                                    if (DbSqlHelper.Update(cmd, "u_mattress", null, mattressInfo, "mattressid", updateField) <= 0)
+                                    {
+                                        throw new LJCommonException("因网络或其它原因,【业务下单/取消】操作失败!");
+                                    }
+
+                                }
+                                else
+                                {
+                                    if (mattressInfo.js1_flag == 1)
+                                    {
+                                        rslt.ErrMsg = "已产品补充审核,不能取消下单!(" + itemid + ")";
+                                        return;
+                                    }
+                                    if (mattressInfo.xd_flag == 0)
+                                    {
+                                        rslt.ErrMsg = "未进行业务下单,不能取消下单!(" + itemid + ")";
+                                        return;
+                                    }
+
+                                    mattressInfo.xd_flag = 0;
+                                    mattressInfo.xd_auditingrep = "";
+                                    mattressInfo.xd_auditingdate = null;
+
+                                    if (DbSqlHelper.Update(cmd, "u_mattress", null, mattressInfo, "mattressid", updateField) <= 0)
+                                    {
+                                        throw new LJCommonException("因网络或其它原因,【业务下单/取消】操作失败!");
+                                    }
+                                }
+                            }
+
+                        }
+                        else if (request.flag != null)
+                        {
+                            // 审核
+
+                            var power73 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 73);
+                            if (!power73 && request.flag == 1)
+                            {
+                                throw new LJCommonException("你没有审核权限");
+                            }
+
+                            var power74 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 74);
+                            if (!power74 && request.flag == 0)
+                            {
+                                throw new LJCommonException("你没有取消审核权限");
+                            }
+
+                            var updateField = "flag, auditingrep, auditingdate";
+
+                            foreach (int itemid in request.mattressids)
+                            {
+                                var mattressInfo = new u_mattress() { mattressid = itemid };
+                                if (DbSqlHelper.SelectOne(cmd, mattressInfo, "flag") != 1)
+                                {
+                                    rslt.ErrMsg = "查找报价单据失败:" + itemid;
+                                    return;
+                                }
+
+                                if (request.flag == 1)
+                                {
+                                    if (mattressInfo.flag == 1)
+                                    {
+                                        rslt.ErrMsg = "床报价已完成审核(" + itemid + ")";
+                                        return;
+                                    }
+
+                                    mattressInfo.flag = 1;
+                                    mattressInfo.auditingrep = tokendata.username;
+                                    mattressInfo.auditingdate = DateTime.Now;
+
+                                    if (DbSqlHelper.Update(cmd, "u_mattress", null, mattressInfo, "mattressid", updateField) <= 0)
+                                    {
+                                        throw new LJCommonException("因网络或其它原因,【审核消】操作失败!");
+                                    }
+
+                                }
+                                else
+                                {
+                                    if (mattressInfo.flag == 0)
+                                    {
+                                        rslt.ErrMsg = "床报价已完成撤销审核!(" + itemid + ")";
+                                        return;
+                                    }
+
+                                    mattressInfo.flag = 0;
+                                    mattressInfo.auditingrep = "";
+                                    mattressInfo.auditingdate = null;
+
+                                    if (DbSqlHelper.Update(cmd, "u_mattress", null, mattressInfo, "mattressid", updateField) <= 0)
+                                    {
+                                        throw new LJCommonException("因网络或其它原因,【撤销审核】操作失败!");
+                                    }
+                                }
+                            }
+
+                        }
+
+
+
+
+                        cmd.Transaction.Commit();
+                    }
+                    catch (Exception e)
+                    {
+                        cmd.Transaction.Rollback();
+                        rslt.ErrMsg = e.ToString();
+                    }
+                }
+            }
+        }
+    }
+}

File diff suppressed because it is too large
+ 59 - 12
JLHHJSvr/Excutor/SaveMattressExcutor.cs


+ 3 - 1
JLHHJSvr/GlobalVar/GlobalVar.cs

@@ -142,7 +142,6 @@ namespace JLHHJSvr
                 excutorManager.AddMap("DeleteMtrlDef", typeof(DeleteMtrlDefRequest), new DeleteMtrlDefExcutor());// 删除物料资料
                 excutorManager.AddMap("DeleteMtrlDef", typeof(DeleteMtrlDefRequest), new DeleteMtrlDefExcutor());// 删除物料资料
                 excutorManager.AddMap("BanMtrlDef", typeof(BanMtrlDefRequest), new BanMtrlDefExcutor());// 禁用物料资料
                 excutorManager.AddMap("BanMtrlDef", typeof(BanMtrlDefRequest), new BanMtrlDefExcutor());// 禁用物料资料
                 excutorManager.AddMap("GetFormulaCompute", typeof(GetFormulaComputeRequest), new GetFormulaComputeExcutor());// 公式计算
                 excutorManager.AddMap("GetFormulaCompute", typeof(GetFormulaComputeRequest), new GetFormulaComputeExcutor());// 公式计算
-                excutorManager.AddMap("SaveMattress", typeof(SaveMattressRequest), new SaveMattressExcutor());// 保存床垫报价
                 excutorManager.AddMap("SaveMultiPrice", typeof(SaveMultiPriceRequest), new SaveMultiPriceExcutor());// 保存多维度定价
                 excutorManager.AddMap("SaveMultiPrice", typeof(SaveMultiPriceRequest), new SaveMultiPriceExcutor());// 保存多维度定价
                 excutorManager.AddMap("DeleteMultiPrice", typeof(DeleteMultiPriceRequest), new DeleteMultiPriceExcutor());// 删除多维度定价
                 excutorManager.AddMap("DeleteMultiPrice", typeof(DeleteMultiPriceRequest), new DeleteMultiPriceExcutor());// 删除多维度定价
                 excutorManager.AddMap("BanMultiPrice", typeof(BanMultiPriceRequest), new BanMultiPriceExcutor());// 禁用多维度定价
                 excutorManager.AddMap("BanMultiPrice", typeof(BanMultiPriceRequest), new BanMultiPriceExcutor());// 禁用多维度定价
@@ -154,6 +153,9 @@ namespace JLHHJSvr
                 excutorManager.AddMap("DeleteConfigureType", typeof(DeleteConfigureTypeRequest), new DeleteConfigureTypeExcutor());// 删除床网分区定义
                 excutorManager.AddMap("DeleteConfigureType", typeof(DeleteConfigureTypeRequest), new DeleteConfigureTypeExcutor());// 删除床网分区定义
 
 
 
 
+                excutorManager.AddMap("SaveMattress", typeof(SaveMattressRequest), new SaveMattressExcutor());// 保存床垫报价
+                excutorManager.AddMap("SaveMattressAuditing", typeof(SaveMattressAuditingRequest), new SaveMattressAuditingExcutor());// 床垫报价:业务下单/取消
+                excutorManager.AddMap("DelMattress", typeof(DelMattressRequest), new DelMattressExcutor());// 床垫报价:删除
                 excutorManager.AddMap("SaveConfigureCode", typeof(SaveConfigureCodeRequest), new SaveConfigureCodeExcutor());// 保存床网分区定义
                 excutorManager.AddMap("SaveConfigureCode", typeof(SaveConfigureCodeRequest), new SaveConfigureCodeExcutor());// 保存床网分区定义
                 excutorManager.AddMap("DeleteConfigureCode", typeof(DeleteConfigureCodeRequest), new DeleteConfigureCodeExcutor());// 删除床网分区定义
                 excutorManager.AddMap("DeleteConfigureCode", typeof(DeleteConfigureCodeRequest), new DeleteConfigureCodeExcutor());// 删除床网分区定义
 
 

+ 5 - 0
JLHHJSvr/JLHHJSvr.csproj

@@ -111,6 +111,7 @@
     <Compile Include="Com\Model\u_configure_type.cs" />
     <Compile Include="Com\Model\u_configure_type.cs" />
     <Compile Include="Com\Model\u_dept.cs" />
     <Compile Include="Com\Model\u_dept.cs" />
     <Compile Include="Com\Model\u_factory_profitrate.cs" />
     <Compile Include="Com\Model\u_factory_profitrate.cs" />
+    <Compile Include="Com\Model\u_his_price.cs" />
     <Compile Include="Com\Model\u_mattress_mx_mtrl.cs" />
     <Compile Include="Com\Model\u_mattress_mx_mtrl.cs" />
     <Compile Include="Com\Model\u_mtrl_price.cs" />
     <Compile Include="Com\Model\u_mtrl_price.cs" />
     <Compile Include="Com\Model\u_mattress.cs" />
     <Compile Include="Com\Model\u_mattress.cs" />
@@ -133,6 +134,8 @@
     <Compile Include="Com\SaveConfigureCodeMx.cs" />
     <Compile Include="Com\SaveConfigureCodeMx.cs" />
     <Compile Include="Com\SaveConfigureType.cs" />
     <Compile Include="Com\SaveConfigureType.cs" />
     <Compile Include="Com\SaveDept.cs" />
     <Compile Include="Com\SaveDept.cs" />
+    <Compile Include="Com\DelMattress.cs" />
+    <Compile Include="Com\SaveMattressAuditing.cs" />
     <Compile Include="Com\SaveMattress.cs" />
     <Compile Include="Com\SaveMattress.cs" />
     <Compile Include="Com\SaveMattressFormula.cs" />
     <Compile Include="Com\SaveMattressFormula.cs" />
     <Compile Include="Com\SaveMattressType.cs" />
     <Compile Include="Com\SaveMattressType.cs" />
@@ -245,6 +248,8 @@
     <Compile Include="Excutor\SaveConfigureCodeMxExcutor.cs" />
     <Compile Include="Excutor\SaveConfigureCodeMxExcutor.cs" />
     <Compile Include="Excutor\SaveConfigureTypeExcutor.cs" />
     <Compile Include="Excutor\SaveConfigureTypeExcutor.cs" />
     <Compile Include="Excutor\SaveDeptExcutor.cs" />
     <Compile Include="Excutor\SaveDeptExcutor.cs" />
+    <Compile Include="Excutor\DelMattressExcutor.cs" />
+    <Compile Include="Excutor\SaveMattressAuditingExcutor.cs" />
     <Compile Include="Excutor\SaveMattressFormulaExcutor.cs" />
     <Compile Include="Excutor\SaveMattressFormulaExcutor.cs" />
     <Compile Include="Excutor\SaveMattressTypeExcutor.cs" />
     <Compile Include="Excutor\SaveMattressTypeExcutor.cs" />
     <Compile Include="Excutor\SaveMtrlDefExcutor.cs" />
     <Compile Include="Excutor\SaveMtrlDefExcutor.cs" />