yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-10-11 16:36:55 +08:00
parent 652e46d68a fa46b297b8
commit a20c941f4d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java
View File

@ -155,14 +155,14 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
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<AggPickmVO> {
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); // 将子项添加到数组
}