补充提交

JLHHJSvr/Excutor/CreatPrdPfExcutor.cs

@@ -108,7 +108,19 @@ namespace JLHHJSvr.Excutor
                     {
                         if (!string.IsNullOrEmpty(mx.wip_type) && !string.IsNullOrEmpty(mx.bj_pzname_mx_mx) && mx.bj_pzname_mx_mx.Contains(" + ") && !bcpNames.ContainsKey(mx.wip_type))
                         {
-                            bcpNames.Add(mx.wip_type, mx.bj_pzname_mx_mx);
+                            var _dscrp = mx.bj_pzname_mx_mx;
+                            var interfaceL = interfaceList.Where(o => _dscrp == o.bj_namemx).ToList();
+                            if (interfaceL.Count > 0)
+                            {
+                                _dscrp = interfaceL[0].bj_namemx;
+                                if (!string.IsNullOrEmpty(interfaceL[0].actual_size)) _dscrp += " + " + interfaceL[0].actual_size;
+                                if (!string.IsNullOrEmpty(interfaceL[0].sb_craft)) _dscrp += " + " + interfaceL[0].sb_craft;
+                                if (!string.IsNullOrEmpty(interfaceL[0].actual_size_sb)) _dscrp += " + " + interfaceL[0].actual_size_sb;
+                                if (interfaceL[0].ss_rate != null && interfaceL[0].ss_rate > 0) _dscrp += " + " + interfaceL[0].ss_rate;
+                                if (interfaceL[0].ls_rate != null && interfaceL[0].ls_rate > 0) _dscrp += " + " + interfaceL[0].ls_rate;
+                            }
+
+                            bcpNames.Add(mx.wip_type, _dscrp);
                         }
                     }
 
@@ -131,17 +143,6 @@ namespace JLHHJSvr.Excutor
                         }
 
                         var _dscrp = mx.bj_pzname_mx_mx;
-                        var interfaceL = interfaceList.Where(o => mx.bj_pzname_mx_mx == o.bj_namemx).ToList();
-                        if (interfaceL.Count > 0)
-                        {
-                            var item = interfaceL[0];
-                            _dscrp = item.bj_namemx;
-                            if (!string.IsNullOrEmpty(item.actual_size)) _dscrp += " + " + item.actual_size;
-                            if (!string.IsNullOrEmpty(item.sb_craft)) _dscrp += " + " + item.sb_craft;
-                            if (!string.IsNullOrEmpty(item.actual_size_sb)) _dscrp += " + " + item.actual_size_sb;
-                            if (item.ss_rate != null && item.ss_rate > 0) _dscrp += " + " + item.ss_rate;
-                            if (item.ls_rate != null && item.ls_rate > 0) _dscrp += " + " + item.ls_rate;
-                        }
                         if (!string.IsNullOrEmpty(mx.wip_type) && !string.IsNullOrEmpty(bcpNames[mx.wip_type]))
                         {
                             _dscrp = bcpNames[mx.wip_type];

JLHHJSvr/Excutor/GetERPMtrlTypeListExcutor.cs

@@ -30,11 +30,11 @@ namespace JLHHJSvr.Excutor
 
                 var erpHelper = HelperBase.GetHelper<ERPHelper>(null);
 
-                var _params = new JObject();
-                _params.Add("parentid", request.parentid);
-                _params.Add("RecurionType", request.RecurionType);
+                //var _params = new JObject();
+                //_params.Add("parentid", request.parentid);
+                //_params.Add("RecurionType", request.RecurionType);
 
-                var list = erpHelper.GetERPList<u_mtrltype>("GetL1Mtrltype", null);
+                var list = erpHelper.GetERPMtrltype(cmd);
 
                 var pk = new PkName()
                 {

JLHHJSvr/Helper/ERPHelper.cs

@@ -301,6 +301,25 @@ namespace JLHHJSvr.Helper
 
             return scworkgroupList;
         }
+        public List<u_mtrltype> GetERPMtrltype(SqlCommand cmd)
+        {
+            var selectStr = @"
+                    SELECT
+                        mtrltypeid,
+                        mtrltype,
+                        handtype,
+                        sonflag,
+                        parentid,
+                        mtrlprp,
+                        typecode,
+                        typecodestr
+                    FROM u_mtrltype_erp";
+            var outputFields = "mtrltypeid,mtrltype,handtype,sonflag,parentid,mtrlprp,typecode,typecodestr";
+            var mtrltypeList = new List<u_mtrltype>();
+            DbSqlHelper.SelectJoin(cmd, selectStr, null, null, null, outputFields, 0, 0, mtrltypeList);
+
+            return mtrltypeList;
+        }
         // 提取请求构建逻辑
         private JObject BuildRequest(JObject parameters)
         {