diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java index d08126f3..59e6d9e7 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java @@ -153,7 +153,8 @@ public class AfterApproveRuleHighpressureMes implements IRule { Map material = (Map) baseDAO.executeQuery(mrlsql, new MapProcessor()); itemObj.put("materialCode", material.get("code")); // 物料编码 itemObj.put("materialName", material.get("name")); // 物料名称 - itemObj.put("materialCategory", material.get("pk_marbasclass")); // 物料分类 + Object marbasclass = hybo.findColValue("bd_marbasclass", "code", " pk_marbasclass = '" + material.get("pk_marbasclass") + "' "); + itemObj.put("materialCategory", marbasclass); // 物料分类 itemObj.put("drawingNumber", drawingNumber); Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' "); @@ -236,7 +237,8 @@ public class AfterApproveRuleHighpressureMes implements IRule { Map material = (Map) baseDAO.executeQuery(mrlsql, new MapProcessor()); itemObj.put("materialCode", material.get("code")); // 物料编码 itemObj.put("materialName", material.get("name")); // 物料名称 - itemObj.put("materialCategory", material.get("pk_marbasclass")); // 物料分类 + Object marbasclass = hybo.findColValue("bd_marbasclass", "code", " pk_marbasclass = '" + material.get("pk_marbasclass") + "' "); + itemObj.put("materialCategory", marbasclass); // 物料分类 itemObj.put("drawingNumber", drawingNumber); Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' "); diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java index fbfc770f..464bd99e 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java @@ -179,7 +179,8 @@ public class AfterPickmRuleHighpressureRule implements IRule { Map material = (Map) baseDAO.executeQuery(mrlsql, new MapProcessor()); itemObj.put("materialCode", material.get("code")); // 物料编码 itemObj.put("materialName", material.get("name")); // 物料名称 - itemObj.put("materialCategory", material.get("pk_marbasclass")); // 物料分类 + Object marbasclass = hybo.findColValue("bd_marbasclass", "code", " pk_marbasclass = '" + material.get("pk_marbasclass") + "' "); + itemObj.put("materialCategory", marbasclass); // 物料分类 itemObj.put("drawingNumber", drawingNumber); Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' "); diff --git a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java index 4befba6c..4e0643e8 100644 --- a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java +++ b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java @@ -139,7 +139,8 @@ public class SyncGyMesPickmUtil { Map material = (Map) baseDAO.executeQuery(mrlsql, new MapProcessor()); itemObj.put("materialCode", material.get("code")); // 物料编码 itemObj.put("materialName", material.get("name")); // 物料名称 - itemObj.put("materialCategory", material.get("pk_marbasclass")); // 物料分类 + Object marbasclass = hybo.findColValue("bd_marbasclass", "code", " pk_marbasclass = '" + material.get("pk_marbasclass") + "' "); + itemObj.put("materialCategory", marbasclass); // 物料分类 itemObj.put("drawingNumber", drawingNumber); Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' ");