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 4e15723a..d08126f3 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 @@ -149,10 +149,11 @@ public class AfterApproveRuleHighpressureMes implements IRule { itemObj.put("totalQuantity", item.getNplanoutnum() != null ? item.getNplanoutnum().doubleValue() : null); // 总数量(计划出库主数量) // 物料信息 - String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; + String mrlsql = "select code,name,graphid,pk_measdoc,materialtype,pk_marbasclass from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; 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")); // 物料分类 itemObj.put("drawingNumber", drawingNumber); Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' "); @@ -231,10 +232,11 @@ public class AfterApproveRuleHighpressureMes implements IRule { itemObj.put("totalQuantity", item.getNplanoutnum() != null ? item.getNplanoutnum().doubleValue() : null); // 总数量(计划出库主数量) // 物料信息 - String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; + String mrlsql = "select code,name,graphid,pk_measdoc,materialtype,pk_marbasclass from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; 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")); // 物料分类 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 d63da98e..fbfc770f 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 @@ -175,10 +175,11 @@ public class AfterPickmRuleHighpressureRule implements IRule { itemObj.put("totalQuantity", item.getNplanoutnum() != null ? item.getNplanoutnum().doubleValue() : null); // 总数量(计划出库主数量) // 物料信息 - String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; + String mrlsql = "select code,name,graphid,pk_measdoc,materialtype,pk_marbasclass from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; 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")); // 物料分类 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 675def2b..4befba6c 100644 --- a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java +++ b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java @@ -135,10 +135,11 @@ public class SyncGyMesPickmUtil { itemObj.put("totalQuantity", item.getNplanoutnum() != null ? item.getNplanoutnum().doubleValue() : null); // 总数量(计划出库主数量) // 物料信息 - String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; + String mrlsql = "select code,name,graphid,pk_measdoc,materialtype,pk_marbasclass from bd_material where pk_material = '" + item.getCbmaterialid() + "' "; 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")); // 物料分类 itemObj.put("drawingNumber", drawingNumber); Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + material.get("pk_measdoc") + "' ");