上传半成本报价代码

JLHHJSvr/Com/AuditMattressBcp.cs

@@ -0,0 +1,33 @@
+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 AuditMattressBcpRequest : ILJRequest<AuditMattressBcpResponse>
+    {
+        public string GetApiName()
+        {
+            return "AuditMattressBcp";
+        }
+        /// <summary>
+        /// 登录token
+        /// </summary>
+        public string token { get; set; }
+        /// <summary>
+        /// 1 - 审核 0 - 撤审
+        /// </summary>
+        public byte type { get; set; }
+        /// <summary>
+        /// 单据id
+        /// </summary>
+        public List<u_semi_finished_product> list { get; set; }
+    }
+
+    public sealed class AuditMattressBcpResponse : LJResponse
+    {
+    }
+}

JLHHJSvr/Com/DeleteMattressBcp.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 DeleteMattressBcpRequest : ILJRequest<DeleteMattressBcpResponse>
+    {
+        public string GetApiName()
+        {
+            return "DeleteMattressBcp";
+        }
+        /// <summary>
+        /// 登录token
+        /// </summary>
+        public string token { get; set; }
+        /// <summary>
+        /// 单据id
+        /// </summary>
+        public List<u_semi_finished_product> list { get; set; }
+    }
+
+    public sealed class DeleteMattressBcpResponse : LJResponse
+    {
+    }
+}

JLHHJSvr/Com/Model/u_semi_finished_product.cs

@@ -0,0 +1,86 @@
+using LJLib.DAL.SQL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    [PK(new[] { "billid" })]
+    public sealed class u_semi_finished_product
+    {
+        /// <summary>
+        /// 单据id
+        /// </summary>
+        public int? billid { get; set; }
+        /// <summary>
+        /// 单据日期
+        /// </summary>
+        public DateTime? billdate { get; set; }
+        /// <summary>
+        /// 报价唯一码
+        /// </summary>
+        public string billcode { get; set; }
+        /// <summary>
+        /// 审核
+        /// </summary>
+        public byte? flag { get; set; }
+        /// <summary>
+        /// 半成品类型
+        /// </summary>
+        public int? semi_finished_type { get; set; }
+        /// <summary>
+        /// 半成品编码
+        /// </summary>
+        public string semi_finished_code { get; set; }
+        /// <summary>
+        /// 半成品名称
+        /// </summary>
+        public string semi_finished_name { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string dscrp { get; set; }
+        /// <summary>
+        /// 生产尺寸
+        /// </summary>
+        public decimal? production_size { get; set; }
+        /// <summary>
+        /// 锁边工艺
+        /// </summary>
+        public decimal? hemming_process { get; set; }
+        /// <summary>
+        /// 锁边后尺寸
+        /// </summary>
+        public decimal? hemmed_size { get; set; }
+        /// <summary>
+        /// 收缩率
+        /// </summary>
+        public decimal? shrinkage_rate { get; set; }
+        /// <summary>
+        /// 拉伸率
+        /// </summary>
+        public decimal? elongation_rate { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string opemp { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? opdate { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        public string auditemp { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        public DateTime? auditdate { get; set; }
+        /// <summary>
+        /// 明细信息
+        /// </summary>
+        public List<u_semi_finished_product_mx> mxlist { get; set; }
+
+    }
+}

JLHHJSvr/Com/Model/u_semi_finished_product_mx.cs

@@ -0,0 +1,54 @@
+using LJLib.DAL.SQL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace JLHHJSvr.Com.Model
+{
+    [PK(new[] { "billid", "printid" })]
+    public sealed class u_semi_finished_product_mx
+    {
+        /// <summary>
+        /// 单据id
+        /// </summary>
+        public int? billid { get; set; }
+        /// <summary>
+        /// 明细id
+        /// </summary>
+        public int? printid { get; set; }
+        /// <summary>
+        /// 物料id
+        /// </summary>
+        public int? mtrlid { get; set; }
+        /// <summary>
+        /// 公式id
+        /// </summary>
+        public int? formulaid { get; set; }
+        /// <summary>
+        /// 位置
+        /// </summary>
+        public string chastr { get; set; }
+        /// <summary>
+        /// 厚度
+        /// </summary>
+        public decimal? thickness { get; set; }
+        /// <summary>
+        /// 数量/长度
+        /// </summary>
+        public decimal? qty { get; set; }
+        /// <summary>
+        /// ERP物料id
+        /// </summary>
+        public int? erp_mtrlid { get; set; }
+        /// <summary>
+        /// 用量分子
+        /// </summary>
+        public decimal? usenum { get; set; }
+        /// <summary>
+        /// 用量分母
+        /// </summary>
+        public decimal? usedenom { get; set; }
+
+    }
+}

JLHHJSvr/Com/SaveMattressBcp.cs

@@ -0,0 +1,27 @@
+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 SaveMattressBcpRequest : ILJRequest<SaveMattressBcpResponse>
+    {
+        public string GetApiName()
+        {
+            return "SaveMattressBcp";
+        }
+        public string token { get; set; }
+        /// <summary>
+        /// 半成品信息：主表
+        /// </summary>
+        public u_semi_finished_product mattress { get; set; }
+    }
+
+    public sealed class SaveMattressBcpResponse : LJResponse
+    {
+        public u_semi_finished_product mattress { get; set; }
+    }
+}

JLHHJSvr/DataStore/_Mapper_queto_billtype.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<data>
+	<json>
+		[
+			{
+			  "label": "床垫",
+			  "value": 0
+			},
+			{
+			  "label": "床网",
+			  "value": 1
+			},
+			{
+			  "label": "半成品",
+			  "value": 2
+			}
+		]
+	</json>
+</data>

JLHHJSvr/DataStore/web_invalid_mtrllist.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+  <selectstr>
+SELECT mtrltype
+	,mtrlname
+	,deptname
+	,billcode
+	,billname
+	,erp_mtrlcode
+	,erp_mtrlname
+	,erp_mtrlmode
+	,erp_mtrltype
+	,mattress_width
+	,mattress_length
+	,mattress_height
+	,billid
+	,billtype
+FROM dbo.GetHisPriceMtrl(@billtype)
+  </selectstr>
+  <where>
+  </where>
+  <displayfields>
+    <field field="pid" compute="getrow()">序</field>
+    <field field="mtrlname">物料名称</field>
+    <field field="erp_mtrlcode">ERP物料编码</field>
+    <field field="erp_mtrlname">ERP物料名称</field>
+    <field field="erp_mtrltype">ERP物料类别</field>
+    <field field="billtype" mapper="queto_billtype">报价类型</field>
+    <field field="deptname">报价部门</field>
+    <field field="billcode">报价唯一码</field>
+    <field field="billname">床垫名称</field>
+    <field field="mattress_width">床垫宽</field>
+    <field field="mattress_length">床垫长</field>
+  </displayfields>
+</select>

JLHHJSvr/DataStore/web_semi_finished_productlist.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+  <selectstr>
+SELECT u_semi_finished_product.billid
+	,u_semi_finished_product.billdate
+	,u_semi_finished_product.billcode
+	,u_semi_finished_product.flag
+	,u_semi_finished_product.semi_finished_type
+	,u_semi_finished_product.semi_finished_code
+	,u_semi_finished_product.semi_finished_name
+	,u_semi_finished_product.dscrp
+	,u_semi_finished_product.production_size
+	,u_semi_finished_product.hemming_process
+	,u_semi_finished_product.hemmed_size
+	,u_semi_finished_product.shrinkage_rate
+	,u_semi_finished_product.elongation_rate
+	,u_semi_finished_product.opemp
+	,u_semi_finished_product.opdate
+	,u_semi_finished_product.auditemp
+	,u_semi_finished_product.auditdate
+FROM u_semi_finished_product
+  </selectstr>
+  <where>
+	<when notnull="@billid">
+		u_semi_finished_product.billid = @billid
+	</when>
+  </where>
+  <displayfields>
+    <field field="pid" compute="getrow()">序</field>
+    <field field="billcode">报价唯一码</field>
+    <field field="semi_finished_type">半成品类型</field>
+    <field field="semi_finished_code">半成品编码</field>
+    <field field="semi_finished_name">半成品名称</field>
+    <field field="flag" datatype="checkbox">审核</field>
+    <field field="opemp">登记人</field>
+    <field field="opdate">登记时间</field>
+    <field field="auditemp">审核人</field>
+    <field field="auditdate">审核时间</field>
+    <field field="billdate">单据日期</field>
+    <field field="production_size">生产尺寸</field>
+    <field field="hemming_process">锁边工艺</field>
+    <field field="hemmed_size">锁边后尺寸</field>
+    <field field="shrinkage_rate">收缩率</field>
+    <field field="elongation_rate">拉伸率</field>
+    <field field="dscrp">备注</field>
+  </displayfields>
+</select>

JLHHJSvr/DataStore/web_semi_finished_productmxlist.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<select>
+  <selectstr>
+SELECT u_semi_finished_product_mx.billid
+	,u_semi_finished_product_mx.printid
+	,u_semi_finished_product_mx.mtrlid
+	,u_semi_finished_product_mx.formulaid
+	,u_semi_finished_product_mx.chastr
+	,u_semi_finished_product_mx.thickness
+	,u_semi_finished_product_mx.qty
+	,u_semi_finished_product_mx.erp_mtrlid
+	,u_semi_finished_product_mx.usenum
+	,u_semi_finished_product_mx.usedenom
+	,ISNULL(u_mtrl_price.name,'') AS mtrlname
+	,u_mattress_formula.if_mtrl
+	,u_mattress_formula.formula
+	,u_mattress_formula.formulatype
+	,u_mattress_formula.formulakind
+FROM u_semi_finished_product_mx
+LEFT OUTER JOIN u_mtrl_price ON u_semi_finished_product_mx.mtrlid = u_mtrl_price.mtrlid
+INNER JOIN u_mattress_formula ON u_semi_finished_product_mx.formulaid = u_mattress_formula.formulaid
+  </selectstr>
+  <where>
+	<when notnull="@billid">
+		u_semi_finished_product_mx.billid = @billid
+	</when>
+  </where>
+  <displayfields>
+    <field field="pid" compute="getrow()">序</field>
+    <field field="chastr">位置</field>
+    <field field="formula">公式名</field>
+    <field field="if_mtrl">按物料</field>
+    <field field="thickness">厚度</field>
+    <field field="mtrlname">核价物料</field>
+    <field field="qty">数量/长度</field>
+    <field field="usenum">用量分子</field>
+    <field field="usedenom">用量分母</field>
+  </displayfields>
+</select>

JLHHJSvr/Excutor/AuditMattressBcpExcutor.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Data.SqlClient;
+using System.Linq;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.LJException;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class AuditMattressBcpExcutor : ExcutorBase<AuditMattressBcpRequest, AuditMattressBcpResponse>
+    {
+        protected override void ExcuteInternal(AuditMattressBcpRequest request, object state, AuditMattressBcpResponse 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();
+
+                if(request.type == 1)
+                {
+                    var power125 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 125);
+                    if (!power125)
+                    {
+                        throw new LJCommonException("你没有审核权限");
+                    }
+                } else
+                {
+                    var power126 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 126);
+                    if (!power126)
+                    {
+                        throw new LJCommonException("你没有撤审权限");
+                    }
+                }
+
+                foreach (var bill in request.list)
+                {
+
+                    if (DbSqlHelper.SelectOne(cmd, bill, "flag") != 1)
+                    {
+                        throw new LJCommonException($"查找半成品报价单据失败!({bill.billid})");
+                    }
+
+                    if (bill.flag == 1 && request.type == 1)
+                    {
+                        throw new LJCommonException($"查找半成品报价单据已审核，不能审核!({bill.billid})");
+                    }
+
+                    if(bill.flag == 0 && request.type == 0)
+                    {
+                        throw new LJCommonException($"查找半成品报价单据未审核，不能撤审!({bill.billid})");
+                    }
+                }
+
+                using (cmd.Transaction = con.BeginTransaction())
+                {
+                    try
+                    {
+                        foreach (var bill in request.list)
+                        {
+                            bill.flag = request.type;
+
+                            DbSqlHelper.Update(cmd, "u_semi_finished_product", null, bill, "billid", "flag");
+                        }
+
+                        cmd.Transaction.Commit();
+                    }
+                    catch (Exception e)
+                    {
+                        cmd.Transaction.Rollback();
+                        rslt.ErrMsg = e.ToString();
+                    }
+                }
+            }
+        }
+    }
+}

JLHHJSvr/Excutor/DeleteMattressBcpExcutor.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Data.SqlClient;
+using System.Linq;
+using JLHHJSvr.BLL;
+using JLHHJSvr.Com;
+using JLHHJSvr.Com.Model;
+using JLHHJSvr.LJException;
+using LJLib.DAL.SQL;
+using LJLib.Net.SPI.Server;
+
+namespace JLHHJSvr.Excutor
+{
+    internal sealed class DeleteMattressBcpExcutor : ExcutorBase<DeleteMattressBcpRequest, DeleteMattressBcpResponse>
+    {
+        protected override void ExcuteInternal(DeleteMattressBcpRequest request, object state, DeleteMattressBcpResponse 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();
+
+                var power127 = UserHelper.CheckFuncPower(cmd, tokendata.empid, 127);
+                if (!power127)
+                {
+                    throw new LJCommonException("你没有删除权限");
+                }
+
+                foreach (var bill in request.list)
+                {
+                    if (DbSqlHelper.SelectOne(cmd, bill, "flag") != 1)
+                    {
+                        throw new LJCommonException($"查找半成品报价单据失败!({bill.billid})");
+                    }
+
+                    if (bill.flag == 1)
+                    {
+                        throw new LJCommonException($"查找半成品报价单据已审核，不能删除!({bill.billid})");
+                    }
+                }
+
+                using (cmd.Transaction = con.BeginTransaction())
+                {
+                    try
+                    {
+                        foreach (var bill in request.list)
+                        {
+                            // 删除半成品明细
+                            cmd.CommandText = @"DELETE FROM u_semi_finished_product_mx WHERE billid = @billid";
+                            cmd.Parameters.Clear();
+                            cmd.Parameters.AddWithValue("@billid", bill.billid.Value);
+                            cmd.ExecuteNonQuery();
+
+                            // 删除半成品明细
+                            cmd.CommandText = @"DELETE FROM u_semi_finished_product_mx WHERE billid = @billid";
+                            cmd.Parameters.Clear();
+                            cmd.Parameters.AddWithValue("@billid", bill.billid.Value);
+                            cmd.ExecuteNonQuery();
+
+                            DbSqlHelper.Delete(cmd, bill);
+                        }
+
+                        cmd.Transaction.Commit();
+                    }
+                    catch (Exception e)
+                    {
+                        cmd.Transaction.Rollback();
+                        rslt.ErrMsg = e.ToString();
+                    }
+                }
+            }
+        }
+    }
+}

JLHHJSvr/Excutor/SaveMattressBcpExcutor.cs

@@ -0,0 +1,137 @@
+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 SaveMattressBcpExcutor : ExcutorBase<SaveMattressBcpRequest, SaveMattressBcpResponse>
+    {
+        protected override void ExcuteInternal(SaveMattressBcpRequest request, object state, SaveMattressBcpResponse rslt)
+        {
+            var tokendata = BllHelper.GetToken(request.token);
+            if (tokendata == null)
+            {
+                rslt.ErrMsg = "会话已经中断，请重新登录";
+                return;
+            }
+            if (request.mattress == null)
+            {
+                rslt.ErrMsg = "缺少主表信息";
+                return;
+            }
+            if(request.mattress.mxlist == null || !request.mattress.mxlist.Any())
+            {
+                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 dtNow = DateTime.Now;
+
+                        var fields = @"billdate,semi_finished_type,semi_finished_code,semi_finished_name,dscrp,production_size,hemming_process,
+                                        hemmed_size,shrinkage_rate,elongation_rate,opemp,opdate,auditemp,auditdate";
+                        var fieldsMx = "billid,printid,mtrlid,formulaid,chastr,thickness,qty,erp_mtrlid,usenum,usedenom";
+
+                        if (request.mattress.billid <= 0)
+                        {
+                            //新建
+                            fields += ",billid,billcode";
+
+                            request.mattress.opdate = dtNow;
+                            request.mattress.opemp = tokendata.username;
+
+                            request.mattress.billid = BllHelper.GetID(cmd, "u_semi_finished_product");
+
+                            switch(request.mattress.semi_finished_type)
+                            {
+                                case 901:
+                                    request.mattress.billcode = "JM";
+                                    break;
+                                case 902:
+                                    request.mattress.billcode = "JD";
+                                    break;
+                                case 903:
+                                    request.mattress.billcode = "BC";
+                                    break;
+                                case 904:
+                                    request.mattress.billcode = "XC";
+                                    break;
+                                case 905:
+                                    request.mattress.billcode = "VC";
+                                    break;
+                            }
+
+                            // 编号-年月日+流水
+                            request.mattress.billcode = $"{request.mattress.billcode}-{dtNow.ToString("yyyyMMdd")}{(request.mattress.billid.Value % 10000).ToString("D4")}";
+
+                            DbSqlHelper.Insert(cmd, "u_semi_finished_product", null, request.mattress, fields);
+                        }
+                        else
+                        {
+                            //修改
+                            cmd.CommandText = @"DELETE FROM u_semi_finished_product_mx WHERE billid = @billid";
+                            cmd.Parameters.Clear();
+                            cmd.Parameters.AddWithValue("@billid", request.mattress.billid);
+                            cmd.ExecuteNonQuery();
+
+                            DbSqlHelper.Update(cmd, "u_semi_finished_product", null, request.mattress, "billid", fields);
+                        }
+
+                        var cnt = 0;
+                        foreach (var mx in request.mattress.mxlist)
+                        {
+                            AutoInit.AutoInitS(cmd, mx);
+
+                            mx.billid = request.mattress.billid;
+                            mx.printid = ++cnt;
+
+                            DbSqlHelper.Insert(cmd, "u_semi_finished_product_mx", null, mx, fieldsMx);
+                        }
+
+                        var hisprice = new u_his_price
+                        {
+                            bednetid_mattressid = request.mattress.billid,
+                            typeid = 2,
+                            cmpdate = dtNow,
+                            cmpemp = tokendata.username,
+                            nottax_dept_cost = 0,
+                            dept_cost = 0,
+                            foreign_cost = 0
+                        };
+                        var fieldsHs = "bednetid_mattressid, typeid, cmpdate, cmpemp, nottax_dept_cost, dept_cost, foreign_cost";
+                        DbSqlHelper.Insert(cmd, "u_his_price", null, hisprice, fieldsHs);
+
+                        cmd.Transaction.Commit();
+
+                        rslt.mattress = new u_semi_finished_product() { billid = request.mattress.billid, billcode = request.mattress.billcode };
+                    }
+                    catch (Exception e)
+                    {
+                        cmd.Transaction.Rollback();
+                        rslt.ErrMsg = e.ToString();
+                    }
+                }
+            }
+        }
+    }
+}

JLHHJSvr/GlobalVar/GlobalVar.cs

@@ -147,23 +147,20 @@ namespace JLHHJSvr
                 excutorManager.AddMap("BanMultiPrice", typeof(BanMultiPriceRequest), new BanMultiPriceExcutor());// 禁用多维度定价
                 excutorManager.AddMap("SaveBedNetArea", typeof(SaveBedNetAreaRequest), new SaveBedNetAreaExcutor());// 保存床网分区定义
                 excutorManager.AddMap("DeleteBedNetArea", typeof(DeleteBedNetAreaRequest), new DeleteBedNetAreaExcutor());// 删除床网分区定义
-
-
-                excutorManager.AddMap("SaveConfigureType", typeof(SaveConfigureTypeRequest), new SaveConfigureTypeExcutor());// 保存床网分区定义
-                excutorManager.AddMap("DeleteConfigureType", typeof(DeleteConfigureTypeRequest), new DeleteConfigureTypeExcutor());// 删除床网分区定义
-
-
+                excutorManager.AddMap("SaveConfigureType", typeof(SaveConfigureTypeRequest), new SaveConfigureTypeExcutor());// 保存部件选配类型
+                excutorManager.AddMap("DeleteConfigureType", typeof(DeleteConfigureTypeRequest), new DeleteConfigureTypeExcutor());// 删除部件选配类型
+                excutorManager.AddMap("SaveConfigureCode", typeof(SaveConfigureCodeRequest), new SaveConfigureCodeExcutor());// 保存部件选配项
+                excutorManager.AddMap("DeleteConfigureCode", typeof(DeleteConfigureCodeRequest), new DeleteConfigureCodeExcutor());// 删除部件选配项
+                excutorManager.AddMap("SaveConfigureCodeMx", typeof(SaveConfigureCodeMxRequest), new SaveConfigureCodeMxExcutor());// 保存部件选配项值
+                excutorManager.AddMap("DeleteConfigureCodeMx", typeof(DeleteConfigureCodeMxRequest), new DeleteConfigureCodeMxExcutor());// 删除部件选配项值
                 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("DeleteConfigureCode", typeof(DeleteConfigureCodeRequest), new DeleteConfigureCodeExcutor());// 删除床网分区定义
-
-
-                excutorManager.AddMap("SaveConfigureCodeMx", typeof(SaveConfigureCodeMxRequest), new SaveConfigureCodeMxExcutor());// 保存床网分区定义
-                excutorManager.AddMap("DeleteConfigureCodeMx", typeof(DeleteConfigureCodeMxRequest), new DeleteConfigureCodeMxExcutor());// 删除床网分区定义
 
 
+                excutorManager.AddMap("SaveMattressBcp", typeof(SaveMattressBcpRequest), new SaveMattressBcpExcutor());// 保存床垫报价
+                excutorManager.AddMap("DeleteMattressBcp", typeof(DeleteMattressBcpRequest), new DeleteMattressBcpExcutor());// 保存床垫报价
+                excutorManager.AddMap("AuditMattressBcp", typeof(AuditMattressBcpRequest), new AuditMattressBcpExcutor());// 保存床垫报价
             }
             catch (Exception ex)
             {

JLHHJSvr/JLHHJSvr.csproj

@@ -51,8 +51,9 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="TExprParser">
-      <HintPath>..\..\..\L1-server\L1-OA_Server\L1Net\DLLs\TExprParser.dll</HintPath>
+    <Reference Include="TExprParser, Version=1.2015.7.19, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\TExprParser.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -67,6 +68,7 @@
     <Compile Include="Com\APP\SaveBill.cs" />
     <Compile Include="Com\APP\TmpGetRoadList.cs" />
     <Compile Include="Com\APP\TmpSavePermit.cs" />
+    <Compile Include="Com\AuditMattressBcp.cs" />
     <Compile Include="Com\AuditSpring.cs" />
     <Compile Include="Com\BanMtrlDef.cs" />
     <Compile Include="Com\BanMultiPrice.cs" />
@@ -79,6 +81,7 @@
     <Compile Include="Com\DeleteConfigureCodeMx.cs" />
     <Compile Include="Com\DeleteConfigureType.cs" />
     <Compile Include="Com\DeleteDept.cs" />
+    <Compile Include="Com\DeleteMattressBcp.cs" />
     <Compile Include="Com\DeleteMattressFormula.cs" />
     <Compile Include="Com\DeleteMattressType.cs" />
     <Compile Include="Com\DeleteMtrlDef.cs" />
@@ -122,6 +125,8 @@
     <Compile Include="Com\Model\u_mtrl_price_pricelist.cs" />
     <Compile Include="Com\Model\u_multiprice.cs" />
     <Compile Include="Com\Model\u_pricelist.cs" />
+    <Compile Include="Com\Model\u_semi_finished_product.cs" />
+    <Compile Include="Com\Model\u_semi_finished_product_mx.cs" />
     <Compile Include="Com\Model\u_shrinkage.cs" />
     <Compile Include="Com\Model\u_spring.cs" />
     <Compile Include="Com\Model\u_workmanship_add.cs" />
@@ -137,6 +142,7 @@
     <Compile Include="Com\DelMattress.cs" />
     <Compile Include="Com\SaveMattressAuditing.cs" />
     <Compile Include="Com\SaveMattress.cs" />
+    <Compile Include="Com\SaveMattressBcp.cs" />
     <Compile Include="Com\SaveMattressFormula.cs" />
     <Compile Include="Com\SaveMattressType.cs" />
     <Compile Include="Com\SaveMtrlDef.cs" />
@@ -198,6 +204,7 @@
     <Compile Include="Excutor\APP\SaveBillExcutor.cs" />
     <Compile Include="Excutor\APP\TmpGetRoadListExcutor.cs" />
     <Compile Include="Excutor\APP\TmpSavePermitExcutor.cs" />
+    <Compile Include="Excutor\AuditMattressBcpExcutor.cs" />
     <Compile Include="Excutor\AuditSpringExcutor.cs" />
     <Compile Include="Excutor\BanMtrlDefExcutor.cs" />
     <Compile Include="Excutor\BanMultiPriceExcutor.cs" />
@@ -210,6 +217,7 @@
     <Compile Include="Excutor\DeleteConfigureCodeMxExcutor.cs" />
     <Compile Include="Excutor\DeleteConfigureTypeExcutor.cs" />
     <Compile Include="Excutor\DeleteDeptExcutor.cs" />
+    <Compile Include="Excutor\DeleteMattressBcpExcutor.cs" />
     <Compile Include="Excutor\DeleteMattressFormulaExcutor.cs" />
     <Compile Include="Excutor\DeleteMattressTypeExcutor.cs" />
     <Compile Include="Excutor\DeleteMtrlDefExcutor.cs" />
@@ -250,6 +258,7 @@
     <Compile Include="Excutor\SaveDeptExcutor.cs" />
     <Compile Include="Excutor\DelMattressExcutor.cs" />
     <Compile Include="Excutor\SaveMattressAuditingExcutor.cs" />
+    <Compile Include="Excutor\SaveMattressBcpExcutor.cs" />
     <Compile Include="Excutor\SaveMattressFormulaExcutor.cs" />
     <Compile Include="Excutor\SaveMattressTypeExcutor.cs" />
     <Compile Include="Excutor\SaveMtrlDefExcutor.cs" />