1、删除旧业务后台连接方式

2、修改使用新连接方式代替旧业务后台连接方式

JLHHJSvr/BLL/HelperBase.cs

@@ -19,10 +19,6 @@ namespace JLHHJSvr.BLL
         /// </summary>
         public SqlCommand cmd { get; set; }
         /// <summary>
-        /// ERP数据库连接
-        /// </summary>
-        public SqlCommand erp_cmd { get; set; }
-        /// <summary>
         /// 预留的上下文
         /// </summary>
         public Context context { get; set; }
@@ -35,15 +31,6 @@ namespace JLHHJSvr.BLL
             return rslt;
         }
 
-        public static T GetHelper<T>(SqlCommand cmd, SqlCommand erp_cmd,Context context = null) where T : HelperBase, new()
-        {
-            var rslt = new T();
-            rslt.cmd = cmd;
-            rslt.erp_cmd = erp_cmd;
-            rslt.context = context ?? new Context();
-            return rslt;
-        }
-
         public JObject DoExecute(string apiName, JObject request)
         {
             var url = GlobalVar.ERP_API_URL + "/api/common/" + apiName;

JLHHJSvr/Com/Model/erp_mtrldef.cs

@@ -18,6 +18,7 @@ namespace JLHHJSvr.Com.Model
 		public string mtrlmode { get; set; }
 		public string unit { get; set; }
 		public string mtrlengname { get; set; }
+		public string zxmtrlmode { get; set; }
 		public int? dftwrkgrpid { get; set; }
     }
 }

JLHHJSvr/Excutor/GetERPMtrldefListExcutor.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Web.UI.WebControls.WebParts;
 using DirectService.Tools;
 using JLHHJSvr.BLL;
 using JLHHJSvr.Com;
@@ -10,6 +11,7 @@ using JLHHJSvr.Helper;
 using JLHHJSvr.LJException;
 using LJLib.DAL.SQL;
 using LJLib.Net.SPI.Server;
+using Newtonsoft.Json.Linq;
 
 namespace JLHHJSvr.Excutor
 {
@@ -29,143 +31,80 @@ namespace JLHHJSvr.Excutor
             {
                 con.Open();
 
-                using (var erp_con = new SqlConnection(BllHelper.GetERPConnectString(cmd)))
-                using (var erp_cmd = erp_con.CreateCommand())
-                {
-                    erp_con.Open();
-                    var mtrldefList = new List<erp_mtrldef>();
+                var erpHelper = HelperBase.GetHelper<ERPHelper>(null);
 
-                    var selectFields =
-                        "row_number() over (order by mtrlcode) as rowNum,u_mtrldef.mtrlid,mtrlcode,mtrlname,mtrlorigin,mtrltype," +
-                        "unit,mtrlmode,mtrlsectype,zxmtrlmode,ISNULL(noallocqty,0) AS noallocqty,u_storage.storagename,u_mtrldef.fjcnt,status_config,woodcode_config,pcode_config,statustype,woodcodetype,pcodetype,u_mtrldef.scid";
-                    var outputFields =
-                        "rowNum,mtrlid,mtrlcode,mtrlname,mtrlorigin,mtrltype,unit,mtrlmode,mtrlsectype,zxmtrlmode,noallocqty,storagename," +
-                        "fjcnt,status_config,woodcode_config,pcode_config,statustype,woodcodetype,pcodetype,scid";
+                var parameters = new JObject();
 
-                    if (request.simpleField != 1)
+                if (request.mtrlid > 0)
+                {
+                    parameters.Add("@mtrlid", request.mtrlid);
+                }
+                else
+                {
+                    if (request.mtrlprp != null && request.mtrlprp != -1)
                     {
-                        selectFields +=
-                            ",handtype,mtrlengname,barcode,u_mtrldef.dscrp,issuliao,isuse,iflimitprice,net_weight,gross_weight,cubage,prdpackcode,opdate,opemp";
-                        outputFields +=
-                            ",handtype,mtrlengname,barcode,u_mtrldef.dscrp,issuliao,isuse,iflimitprice,net_weight,gross_weight,cubage,prdpackcode,opdate,opemp";
+                        parameters.Add("@mtrlprp", request.mtrlprp);
                     }
-                    var selectStr = string.Format(@"
-                    SELECT {0}
-                    FROM   u_mtrldef
-                            LEFT OUTER JOIN (SELECT Sum(noallocqty) noallocqty
-                                                    ,mtrlid
-                                            FROM   u_mtrlware
-                                            GROUP  BY mtrlid) AS vvv_mtrlware
-                                        ON vvv_mtrlware.mtrlid = u_mtrldef.mtrlid 
-                            LEFT JOIN u_mtrl_storage on u_mtrl_storage.mtrlid = u_mtrldef.mtrlid and u_mtrl_storage.dft = 1
-                            LEFT OUTER JOIN u_storage on u_storage.scid = u_mtrldef.scid and u_storage.storageid = u_mtrl_storage.storageid",
-                        selectFields);
-
-                    var whereList = new List<string>();
-                    var parms = new Dictionary<string, object>();
-
-                    ////查看有权限类别的物料
-                    //var mtrltypeids = UserHelper.ParsePowerStr(cmd, tokenData.empid, "mtrltypestr");
-
-                    //if (!string.IsNullOrEmpty(mtrltypeids))
-                    //{
-                    //    whereList.Add($"u_mtrldef.mtrltypeid IN {mtrltypeids}");
-                    //}
-
-                    if (request.mtrlid > 0)
+                    if (request.mtrltypeid != null && request.mtrltypeid != -1)
                     {
-                        whereList.Add("u_mtrldef.mtrlid = @mtrlid");
-                        parms.Add("@mtrlid", request.mtrlid);
+                        parameters.Add("@mtrltypeid", request.mtrltypeid);
                     }
-                    else
+                    if (request.storageid != null && request.storageid != -1)
                     {
-                        if (request.mtrlprp != null && request.mtrlprp != -1)
-                        {
-                            whereList.Add("u_mtrldef.mtrlprp = @mtrlprp");
-                            parms.Add("@mtrlprp", request.mtrlprp);
-                        }
-                        if (request.mtrltypeid != null && request.mtrltypeid != -1)
-                        {
-                            whereList.Add("u_mtrldef.mtrltypeid = @mtrltypeid");
-                            parms.Add("@mtrltypeid", request.mtrltypeid);
-                        }
-                        if (request.storageid != null && request.storageid != -1)
-                        {
-                            whereList.Add(
-                                "EXISTS (SELECT mtrlwareid FROM u_mtrlware WHERE mtrlid = u_mtrldef.mtrlid AND storageid = @storageid)");
-                            parms.Add("@storageid", request.storageid);
-                        }
-                        if (request.mtrlorigin != null && request.mtrlorigin != -1)
-                        {
-                            whereList.Add("u_mtrldef.mtrlorigin = @mtrlorigin");
-                            parms.Add("@mtrlorigin", request.mtrlorigin);
-                        }
-                        if (request.isuse != null && request.isuse != -1)
-                        {
-                            whereList.Add("u_mtrldef.isuse = @isuse");
-                            parms.Add("@isuse", request.isuse);
-                        }
-                        if (!string.IsNullOrEmpty(request.keyword))
-                        {
-                            whereList.Add(@"(u_mtrldef.mtrlcode LIKE @keyword) 
-                                            OR (u_mtrldef.mtrlname LIKE @keyword) 
-                                            OR (u_mtrldef.mtrlmode LIKE @keyword) 
-                                            OR (u_mtrldef.mtrlsectype LIKE @keyword) 
-                                            OR (u_mtrldef.zxmtrlmode LIKE @keyword)
-                                            OR (u_mtrldef.usermtrlmode LIKE @keyword)
-                                            OR (u_mtrldef.plancode LIKE @keyword)");
-                            parms.Add("@keyword", "%" + request.keyword + "%");
-                        }
-
-                        if (!string.IsNullOrEmpty(request.mtrlcode))
-                        {
-                            whereList.Add("u_mtrldef.mtrlcode LIKE @mtrlcode");
-                            parms.Add("@mtrlcode", "%" + request.mtrlcode + "%");
-                        }
+                        parameters.Add("@storageid", request.storageid);
+                    }
+                    if (request.mtrlorigin != null && request.mtrlorigin != -1)
+                    {
+                        parameters.Add("@mtrlorigin", request.mtrlorigin);
+                    }
+                    if (request.isuse != null && request.isuse != -1)
+                    {
+                        parameters.Add("@isuse", request.isuse);
+                    }
+                    if (!string.IsNullOrEmpty(request.keyword))
+                    {
+                        parameters.Add("@keyword", request.keyword);
+                    }
 
-                        if (!string.IsNullOrEmpty(request.mtrlname))
-                        {
-                            whereList.Add("u_mtrldef.mtrlname LIKE @mtrlname");
-                            parms.Add("@mtrlname", "%" + request.mtrlname + "%");
-                        }
+                    if (!string.IsNullOrEmpty(request.mtrlcode))
+                    {
+                        parameters.Add("@mtrlcode", request.mtrlcode);
+                    }
 
-                        if (!string.IsNullOrEmpty(request.mtrlmode))
-                        {
-                            whereList.Add("u_mtrldef.mtrlmode LIKE @mtrlmode");
-                            parms.Add("@mtrlmode", "%" + request.mtrlmode + "%");
-                        }
+                    if (!string.IsNullOrEmpty(request.mtrlname))
+                    {
+                        parameters.Add("@mtrlname", request.mtrlname);
+                    }
 
-                        if (!string.IsNullOrEmpty(request.mtrlsectype))
-                        {
-                            whereList.Add("u_mtrldef.mtrlsectype LIKE @mtrlsectype");
-                            parms.Add("@mtrlsectype", "%" + request.mtrlsectype + "%");
-                        }
+                    if (!string.IsNullOrEmpty(request.mtrlmode))
+                    {
+                        parameters.Add("@mtrlmode", request.mtrlmode);
+                    }
 
-                        if (!string.IsNullOrEmpty(request.zxmtrlmode))
-                        {
-                            whereList.Add("u_mtrldef.zxmtrlmode LIKE @zxmtrlmode");
-                            parms.Add("@zxmtrlmode", "%" + request.zxmtrlmode + "%");
-                        }
+                    if (!string.IsNullOrEmpty(request.mtrlsectype))
+                    {
+                        parameters.Add("@mtrlsectype", request.mtrlsectype);
+                    }
 
-                        if (!string.IsNullOrEmpty(request.usermtrlmode))
-                        {
-                            whereList.Add("u_mtrldef.usermtrlmode LIKE @usermtrlmode");
-                            parms.Add("@usermtrlmode", "%" + request.usermtrlmode + "%");
-                        }
+                    if (!string.IsNullOrEmpty(request.zxmtrlmode))
+                    {
+                        parameters.Add("@zxmtrlmode", request.zxmtrlmode);
+                    }
 
-                        if (!string.IsNullOrEmpty(request.plancode))
-                        {
-                            whereList.Add("u_mtrldef.plancode LIKE @plancode");
-                            parms.Add("@plancode", "%" + request.plancode + "%");
-                        }
+                    if (!string.IsNullOrEmpty(request.usermtrlmode))
+                    {
+                        parameters.Add("@usermtrlmode", request.usermtrlmode);
                     }
-                    var whereStr = ListEx.GetWhereStr(whereList);
-                    var orderStr = "mtrlcode";
-                    DbSqlHelper.SelectJoin(erp_cmd, selectStr, whereStr, parms, orderStr, outputFields, request.pageindex,
-                        request.pagesize, mtrldefList);
 
-                    rslt.mtrldefList = mtrldefList;
+                    if (!string.IsNullOrEmpty(request.plancode))
+                    {
+                        parameters.Add("@plancode", request.plancode);
+                    }
                 }
+
+                var resultList = erpHelper.GetERPList<erp_mtrldef>("GetL1Mtrldef", parameters);
+
+                rslt.mtrldefList = resultList;
             }
         }
     }

JLHHJSvr/Excutor/GetMattressInterfaceListExcutor.cs

@@ -81,21 +81,15 @@ namespace JLHHJSvr.Excutor
                     }
                 }
 
-                using (var erp_con = new SqlConnection(BllHelper.GetERPConnectString(cmd)))
-                using (var erp_cmd = erp_con.CreateCommand())
-                {
-                    erp_con.Open();
-
-                    var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, erp_cmd, new HelperBase.Context() { tokendata = tokendata });
+                var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
 
-                    var interfaceList = interfaceHelper.GetMattressInterfaceList(request.mattressid.Value);
-                    var qdList = interfaceHelper.GetMattressInterfaceQdList(request.mattressid.Value);
+                var interfaceList = interfaceHelper.GetMattressInterfaceList(request.mattressid.Value);
+                var qdList = interfaceHelper.GetMattressInterfaceQdList(request.mattressid.Value);
 
-                    interfaceHelper.MattressInterfaceFindERPPrdPf(qdList, interfaceList);
+                interfaceHelper.MattressInterfaceFindERPPrdPf(qdList, interfaceList);
 
-                    rslt.interfaceList = interfaceList;
-                    rslt.qdList = qdList;
-                }
+                rslt.interfaceList = interfaceList;
+                rslt.qdList = qdList;
             }
         }
     }

JLHHJSvr/Excutor/ReBuildMattressInterfaceExcutor.cs

@@ -50,17 +50,11 @@ namespace JLHHJSvr.Excutor
                             FROM u_mattress_interface";
                 DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype", 0, 0, copy_list);
 
-                using (var erp_con = new SqlConnection(BllHelper.GetERPConnectString(cmd)))
-                using (var erp_cmd = erp_con.CreateCommand())
-                {
-                    erp_con.Open();
+                var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
 
-                    var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, erp_cmd, new HelperBase.Context() { tokendata = tokendata });
+                var interfaceList = interfaceHelper.RefreshMattressInterfaceList(request.mattressid.Value);
 
-                    var interfaceList = interfaceHelper.RefreshMattressInterfaceList(request.mattressid.Value);
-
-                    rslt.mxList = interfaceList;
-                }
+                rslt.mxList = interfaceList;
             }
         }
     }

JLHHJSvr/Excutor/RefreshMattressInterfaceExcutor.cs

@@ -50,52 +50,46 @@ namespace JLHHJSvr.Excutor
                             FROM u_mattress_interface";
                 DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", "mattressid,printid,itemname,bj_pzname,bj_namemx,actual_size,sb_craft,actual_size_sb,erp_pzid,ss_rate,ls_rate,bj_inputtype", 0, 0, copy_list);
 
-                using (var erp_con = new SqlConnection(BllHelper.GetERPConnectString(cmd)))
-                using (var erp_cmd = erp_con.CreateCommand())
-                {
-                    erp_con.Open();
+                var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
 
-                    var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd,erp_cmd, new HelperBase.Context() { tokendata = tokendata });
+                var interfaceList = interfaceHelper.RefreshMattressInterfaceList(request.mattressid.Value);
 
-                    var interfaceList = interfaceHelper.RefreshMattressInterfaceList(request.mattressid.Value);
+                if (request.isPz != null && request.isPz == 1)
+                {
+                    var copyDict = copy_list.Where(mx2 => mx2.erp_pzid > 0)
+                                .ToDictionary(mx2 => mx2.erp_pzid, mx2 => mx2);
 
-                    if(request.isPz != null && request.isPz == 1)
+                    foreach (var mx in interfaceList)
                     {
-                        var copyDict = copy_list.Where(mx2 => mx2.erp_pzid > 0)
-                                    .ToDictionary(mx2 => mx2.erp_pzid, mx2 => mx2);
-
-                        foreach (var mx in interfaceList)
+                        if (mx.erp_pzid > 0 && copyDict.TryGetValue(mx.erp_pzid, out var mx2))
                         {
-                            if (mx.erp_pzid > 0 && copyDict.TryGetValue(mx.erp_pzid, out var mx2))
+                            if (mx.bj_inputtype != 2 || (mx.bj_inputtype == 2 && mx2.bj_inputtype == 1))
                             {
-                                if (mx.bj_inputtype != 2 || (mx.bj_inputtype == 2 && mx2.bj_inputtype == 1))
-                                {
-                                    mx.bj_namemx = mx2.bj_namemx;
-                                    mx.actual_size = mx2.actual_size;
-                                    mx.sb_craft = mx2.sb_craft;
-                                    mx.actual_size_sb = mx2.actual_size_sb;
-                                    mx.ss_rate = mx2.ss_rate;
-                                    mx.ls_rate = mx2.ls_rate;
+                                mx.bj_namemx = mx2.bj_namemx;
+                                mx.actual_size = mx2.actual_size;
+                                mx.sb_craft = mx2.sb_craft;
+                                mx.actual_size_sb = mx2.actual_size_sb;
+                                mx.ss_rate = mx2.ss_rate;
+                                mx.ls_rate = mx2.ls_rate;
 
-                                    if (mx.bj_inputtype == 2 && mx2.bj_inputtype == 1)
-                                    {
-                                        mx.bj_inputtype = 1;
-                                    }
-                                }
-                                else
+                                if (mx.bj_inputtype == 2 && mx2.bj_inputtype == 1)
                                 {
-                                    mx.actual_size = mx2.actual_size;
-                                    mx.sb_craft = mx2.sb_craft;
-                                    mx.actual_size_sb = mx2.actual_size_sb;
-                                    mx.ss_rate = mx2.ss_rate;
-                                    mx.ls_rate = mx2.ls_rate;
+                                    mx.bj_inputtype = 1;
                                 }
                             }
+                            else
+                            {
+                                mx.actual_size = mx2.actual_size;
+                                mx.sb_craft = mx2.sb_craft;
+                                mx.actual_size_sb = mx2.actual_size_sb;
+                                mx.ss_rate = mx2.ss_rate;
+                                mx.ls_rate = mx2.ls_rate;
+                            }
                         }
                     }
-
-                    rslt.mxList = interfaceList;
                 }
+
+                rslt.mxList = interfaceList;
             }
         }
     }

JLHHJSvr/Excutor/RefreshMattressInterfaceQdExcutor.cs

@@ -66,53 +66,46 @@ namespace JLHHJSvr.Excutor
                 var outputFields = "mattressid,printid,itemname,bj_pzname,bj_pzname_mx,bj_pzname_mx_mx,mtrlid,erp_mtrlid,useqty,dscrp,mtrlname,actual_useqty,qd_actual_size,qd_pfgroupqty,wrkgrpid,ss_rate,ls_rate,sh_rate";
                 DbSqlHelper.SelectJoin(cmd, selectStr, "mattressid = @mattressid", new Dictionary<string, object>() { { "@mattressid", request.mattressid } }, "printid", outputFields, 0, 0, copy_list);
 
+                var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, new HelperBase.Context() { tokendata = tokendata });
 
-                using (var erp_con = new SqlConnection(BllHelper.GetERPConnectString(cmd)))
-                using (var erp_cmd = erp_con.CreateCommand())
-                {
-                    erp_con.Open();
-
-                    var interfaceHelper = HelperBase.GetHelper<InterfaceHelper>(cmd, erp_cmd, new HelperBase.Context() { tokendata = tokendata });
+                var qdList = interfaceHelper.RefreshMattressInterfaceQdList(request.mattressid.Value);
 
-                    var qdList = interfaceHelper.RefreshMattressInterfaceQdList(request.mattressid.Value);
+                if (request.isPz != null && request.isPz == 1)
+                {
+                    var copyDict = new Dictionary<Tuple<string, string, string>, u_mattress_interface_qd>();
 
-                    if(request.isPz != null && request.isPz == 1)
+                    foreach (var mx2 in copy_list)
                     {
-                        var copyDict = new Dictionary<Tuple<string, string, string>, u_mattress_interface_qd>();
-
-                        foreach (var mx2 in copy_list)
+                        var key = Tuple.Create(mx2.itemname, mx2.bj_pzname, mx2.bj_pzname_mx);
+                        if (!copyDict.ContainsKey(key))
                         {
-                            var key = Tuple.Create(mx2.itemname, mx2.bj_pzname, mx2.bj_pzname_mx);
-                            if (!copyDict.ContainsKey(key))
-                            {
-                                copyDict[key] = mx2;
-                            }
+                            copyDict[key] = mx2;
                         }
+                    }
 
-                        // 遍历qdList
-                        foreach (var mx in qdList)
+                    // 遍历qdList
+                    foreach (var mx in qdList)
+                    {
+                        var key = Tuple.Create(mx.itemname, mx.bj_pzname, mx.bj_pzname_mx); // 创建复合键
+                        if (copyDict.TryGetValue(key, out var mx2)) // 高效查找对应的mx2
                         {
-                            var key = Tuple.Create(mx.itemname, mx.bj_pzname, mx.bj_pzname_mx); // 创建复合键
-                            if (copyDict.TryGetValue(key, out var mx2)) // 高效查找对应的mx2
-                            {
-                                // 更新mx属性
-                                mx.erp_mtrlid = mx2.erp_mtrlid;
-                                mx.erp_mtrlcode = mx2.erp_mtrlcode;
-                                mx.erp_mtrlname = mx2.erp_mtrlname;
-                                mx.erp_mtrlmode = mx2.erp_mtrlmode;
-                                mx.erp_unit = mx2.erp_unit;
-                                mx.useqty = mx2.useqty;
-                                mx.actual_useqty = mx2.actual_useqty;
-                                mx.wrkgrpid = mx2.wrkgrpid;
-                                mx.qd_actual_size = mx2.qd_actual_size;
-                                mx.qd_pfgroupqty = mx2.qd_pfgroupqty;
-                                mx.dscrp = mx2.dscrp;
-                            }
+                            // 更新mx属性
+                            mx.erp_mtrlid = mx2.erp_mtrlid;
+                            mx.erp_mtrlcode = mx2.erp_mtrlcode;
+                            mx.erp_mtrlname = mx2.erp_mtrlname;
+                            mx.erp_mtrlmode = mx2.erp_mtrlmode;
+                            mx.erp_unit = mx2.erp_unit;
+                            mx.useqty = mx2.useqty;
+                            mx.actual_useqty = mx2.actual_useqty;
+                            mx.wrkgrpid = mx2.wrkgrpid;
+                            mx.qd_actual_size = mx2.qd_actual_size;
+                            mx.qd_pfgroupqty = mx2.qd_pfgroupqty;
+                            mx.dscrp = mx2.dscrp;
                         }
                     }
-
-                    rslt.mxList = qdList;
                 }
+
+                rslt.mxList = qdList;
             }
         }
     }

JLHHJSvr/Helper/ERPHelper.cs

@@ -60,6 +60,7 @@ namespace JLHHJSvr.Helper
                 {"GetL1Mtrldef","mtrldefList" },
                 {"GetSCWorkgroupList","scworkgroupList" },
                 {"GetL1Mtrltype","mtrltypeList" },
+                {"CommonDynamicSelect","datatable" }
             };
 
             var request = new JObject();

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -293,22 +293,21 @@ namespace JLHHJSvr.Helper
             #region 自定义配置导入
             if(mattress.erp_configcodetype != null && mattress.erp_configcodetype > 0)
             {
-                erp_cmd.CommandText = @"SELECT u_configure_code.pzid
-	                                    ,u_configure_code.pzcode
-	                                    ,u_configure_code.name
-	                                    ,u_configure_code.inputtype
-                                    FROM u_configure_code
-                                    WHERE u_configure_code.typeid = @configcodetype
-	                                    AND u_configure_code.ifpack = 1";
-                erp_cmd.Parameters.Clear();
-                erp_cmd.Parameters.AddWithValue("@configcodetype", mattress.erp_configcodetype);
-                using (var reader = erp_cmd.ExecuteReader())
+                var erpHelper = HelperBase.GetHelper<ERPHelper>(null);
+
+                var parameters = new JObject();
+                parameters.Add("dsname", "web_configure_code_list");
+                var queryparams = new JObject();
+                queryparams.Add("arg_configcodetype", mattress.erp_configcodetype);
+                queryparams.Add("arg_ifpack", 1);
+                parameters.Add("queryparams", queryparams);
+
+                var resultList = erpHelper.GetERPList<erp_configure_code>("CommonDynamicSelect", parameters);
+
+                foreach(var result in resultList)
                 {
-                    while (reader.Read())
-                    {
-                        var pzname = Convert.ToString(reader["name"]);
-                        interfaceList.Add(InserMattressInterfacePz("自定义", pzname, 1, new string[] { "" }));
-                    }
+                    var pzname = result.name;
+                    interfaceList.Add(InserMattressInterfacePz("自定义", pzname, 1, new string[] { "" }));
                 }
             }
             #endregion
@@ -326,33 +325,60 @@ namespace JLHHJSvr.Helper
             {
                 interfaceList[i].printid = i + 1;
 
-                erp_cmd.CommandText = @"SELECT u_configure_code.pzid
-	                                    ,u_configure_code.pzcode
-	                                    ,u_configure_code.name
-	                                    ,u_configure_code.inputtype
-                                    FROM u_configure_code
-                                    WHERE u_configure_code.typeid = @configcodetype
-	                                    AND u_configure_code.name = @pzname";
-                erp_cmd.Parameters.Clear();
-                erp_cmd.Parameters.AddWithValue("@configcodetype", mattress.erp_configcodetype);
-                erp_cmd.Parameters.AddWithValue("@pzname", interfaceList[i].bj_pzname);
-                using (var reader = erp_cmd.ExecuteReader())
+                //erp_cmd.CommandText = @"SELECT u_configure_code.pzid
+	               //                     ,u_configure_code.pzcode
+	               //                     ,u_configure_code.name
+	               //                     ,u_configure_code.inputtype
+                //                    FROM u_configure_code
+                //                    WHERE u_configure_code.typeid = @configcodetype
+	               //                     AND u_configure_code.name = @pzname";
+                //erp_cmd.Parameters.Clear();
+                //erp_cmd.Parameters.AddWithValue("@configcodetype", mattress.erp_configcodetype);
+                //erp_cmd.Parameters.AddWithValue("@pzname", interfaceList[i].bj_pzname);
+                //using (var reader = erp_cmd.ExecuteReader())
+                //{
+                //    if (reader.Read())
+                //    {
+                //        var pzid = Convert.ToInt32(reader["pzid"]);
+                //        var pzname = Convert.ToString(reader["name"]);
+                //        var pzcode = Convert.ToString(reader["pzcode"]);
+                //        var inputtype = Convert.ToByte(reader["inputtype"]);
+                //        if (pzid > 0)
+                //        {
+                //            interfaceList[i].erp_pzid = pzid;
+                //            interfaceList[i].erp_pzcode = pzcode;
+                //            interfaceList[i].erp_pzname = pzname;
+                //        }
+
+                //        if (interfaceList[i].bj_inputtype != 2) interfaceList[i].bj_inputtype = inputtype;
+                //    }
+                //}
+
+                var erpHelper = HelperBase.GetHelper<ERPHelper>(null);
+
+                var parameters = new JObject();
+                parameters.Add("dsname", "web_configure_code_list");
+                var queryparams = new JObject();
+                queryparams.Add("arg_configcodetype", mattress.erp_configcodetype);
+                queryparams.Add("arg_pzname", interfaceList[i].bj_pzname);
+                parameters.Add("queryparams", queryparams);
+
+                var resultList = erpHelper.GetERPList<erp_configure_code>("CommonDynamicSelect", parameters);
+
+                foreach (var result in resultList) 
                 {
-                    if (reader.Read())
+                    //var pzid = Convert.ToInt32(result["pzid"]);
+                    //var pzname = Convert.ToString(result["name"]);
+                    //var pzcode = Convert.ToString(result["pzcode"]);
+                    //var inputtype = Convert.ToByte(result["inputtype"]);
+                    if (result.pzid > 0)
                     {
-                        var pzid = Convert.ToInt32(reader["pzid"]);
-                        var pzname = Convert.ToString(reader["name"]);
-                        var pzcode = Convert.ToString(reader["pzcode"]);
-                        var inputtype = Convert.ToByte(reader["inputtype"]);
-                        if (pzid > 0)
-                        {
-                            interfaceList[i].erp_pzid = pzid;
-                            interfaceList[i].erp_pzcode = pzcode;
-                            interfaceList[i].erp_pzname = pzname;
-                        }
-
-                        if (interfaceList[i].bj_inputtype != 2) interfaceList[i].bj_inputtype = inputtype;
+                        interfaceList[i].erp_pzid = result.pzid;
+                        interfaceList[i].erp_pzcode = result.pzcode;
+                        interfaceList[i].erp_pzname = result.name;
                     }
+
+                    if (interfaceList[i].bj_inputtype != 2) interfaceList[i].bj_inputtype = result.inputtype;
                 }
             }
         }
@@ -1034,29 +1060,49 @@ namespace JLHHJSvr.Helper
             {
                 if(mx.erp_mtrlid > 0)
                 {
-                    erp_cmd.CommandText = @"SELECT mtrlid
-	                                    ,mtrlcode
-	                                    ,mtrlname
-	                                    ,mtrlmode
-	                                    ,unit
-	                                    ,dftwrkgrpid
-	                                    ,mtrlengname
-	                                    ,zxmtrlmode
-                                    FROM u_mtrldef
-                                    WHERE mtrlid = @mtrlid";
-                    erp_cmd.Parameters.Clear();
-                    erp_cmd.Parameters.AddWithValue("@mtrlid", mx.erp_mtrlid);
-                    using (var reader = erp_cmd.ExecuteReader())
+                    //erp_cmd.CommandText = @"SELECT mtrlid
+                    //                 ,mtrlcode
+                    //                 ,mtrlname
+                    //                 ,mtrlmode
+                    //                 ,unit
+                    //                 ,dftwrkgrpid
+                    //                 ,mtrlengname
+                    //                 ,zxmtrlmode
+                    //                FROM u_mtrldef
+                    //                WHERE mtrlid = @mtrlid";
+                    //erp_cmd.Parameters.Clear();
+                    //erp_cmd.Parameters.AddWithValue("@mtrlid", mx.erp_mtrlid);
+                    //using (var reader = erp_cmd.ExecuteReader())
+                    //{
+                    //    if (reader.Read())
+                    //    {
+                    //        mx.erp_mtrlcode = Convert.ToString(reader["mtrlcode"]);
+                    //        mx.erp_mtrlname = Convert.ToString(reader["mtrlname"]);
+                    //        mx.erp_mtrlmode = Convert.ToString(reader["mtrlmode"]);
+                    //        mx.erp_unit = Convert.ToString(reader["unit"]);
+                    //        mx.erp_mtrlengname = Convert.ToString(reader["zxmtrlmode"]);
+                    //    }
+                    //}
+
+                    var erpHelper = HelperBase.GetHelper<ERPHelper>(null);
+
+                    var parameters = new JObject();
+                    parameters.Add("mtrlid", mx.erp_mtrlid);
+
+                    var resultList = erpHelper.GetERPList<erp_mtrldef>("GetL1Mtrldef", parameters);
+
+                    if(resultList != null && resultList.Any())
                     {
-                        if (reader.Read())
+                        foreach(var result in resultList)
                         {
-                            mx.erp_mtrlcode = Convert.ToString(reader["mtrlcode"]);
-                            mx.erp_mtrlname = Convert.ToString(reader["mtrlname"]);
-                            mx.erp_mtrlmode = Convert.ToString(reader["mtrlmode"]);
-                            mx.erp_unit = Convert.ToString(reader["unit"]);
-                            mx.erp_mtrlengname = Convert.ToString(reader["zxmtrlmode"]);
+                            mx.erp_mtrlcode = result.mtrlcode;
+                            mx.erp_mtrlname = result.mtrlname;
+                            mx.erp_mtrlmode = result.mtrlmode;
+                            mx.erp_unit = result.unit;
+                            mx.erp_mtrlengname = result.zxmtrlmode;
                         }
                     }
+
                 }
             }