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 27953804..77b82446 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 @@ -155,14 +155,14 @@ public class AfterApproveRuleHighpressureMes implements IRule { itemObj.put("intervalModel", material.get("materialtype")); // 产品类型 itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号 // 项目编码 - String cprojectid = pickmHeadVO.getCprojectid();// 项目id + String cprojectid = item.getCbprojectid();// 项目id String projectCode = MyHelper.getStrValByCondition(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_CODE, ProjectHeadVO.PK_PROJECT + " = '" + cprojectid + "'"); - singleObj.put("cbprojectid", projectCode); + itemObj.put("cbprojectid", projectCode); // 生产厂商 String productor = item.getCbproductorid();// 生产厂商id - String productorCode = getDefCode("Defdoc-BD006_0xx", item.getCbproductorid()); - singleObj.put("cbproductorid", productorCode); + String productorCode = getDefCode("BD006_0xx", item.getCbproductorid()); + itemObj.put("cbproductorid", productorCode); contentArray.add(itemObj); // 将子项添加到数组 } @@ -233,14 +233,14 @@ public class AfterApproveRuleHighpressureMes implements IRule { itemObj.put("intervalModel", material.get("materialtype")); // 产品类型 itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号 // 项目编码 - String cprojectid = pickmHeadVO.getCprojectid();// 项目id + String cprojectid = item.getCbprojectid();// 项目id String projectCode = MyHelper.getStrValByCondition(ProjectHeadVO.getDefaultTableName(), ProjectHeadVO.PROJECT_CODE, ProjectHeadVO.PK_PROJECT + " = '" + cprojectid + "'"); - singleObj.put("cbprojectid", projectCode); + itemObj.put("cbprojectid", projectCode); // 生产厂商 // String productor = item.getCbproductorid();// 生产厂商id - String productorCode = getDefCode("Defdoc-BD006_0xx", item.getCbproductorid()); - singleObj.put("cbproductorid", productorCode); + String productorCode = getDefCode("BD006_0xx", item.getCbproductorid()); + itemObj.put("cbproductorid", productorCode); contentArray.add(itemObj); // 将子项添加到数组 }