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

备料计划点击备料重算后调高压MES修改 优化

This commit is contained in:
houyi 2025-10-27 17:07:12 +08:00
parent ddb7eda540
commit d13a478b11
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,9 +101,10 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
// 生产部门 // 生产部门
String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 "; String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 ";
Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor()); Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor());
singleObj.put("bipDeptName", dept.get("name")); // 生产部门 if (!dept.isEmpty()) {
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码 singleObj.put("bipDeptName", dept.get("name")); // 生产部门
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码
}
singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号 singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号 singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号
singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 上级来源单据号 singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 上级来源单据号
@ -140,8 +141,8 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
JSONObject itemObj = new JSONObject(); JSONObject itemObj = new JSONObject();
itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID
// itemObj.put("bchkitemforwr", item.getBchkitemforwr()); // 完工齐套检查 // itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查
itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查 itemObj.put("bchkitemforwr",item.getBchkitemforwr().booleanValue()?"Y":"N"); // 完工齐套检查
itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量） itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量）
itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量 itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量
itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量 itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量
@ -180,8 +181,10 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
// 生产部门 // 生产部门
String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 "; String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 ";
Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor()); Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor());
singleObj.put("bipDeptName", dept.get("name")); // 生产部门 if (!dept.isEmpty()) {
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码 singleObj.put("bipDeptName", dept.get("name")); // 生产部门
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码
}
singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号 singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号 singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号
@ -220,7 +223,8 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
JSONObject itemObj = new JSONObject(); JSONObject itemObj = new JSONObject();
itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID
itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查 // itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查
itemObj.put("bchkitemforwr",item.getBchkitemforwr().booleanValue()?"Y":"N"); // 完工齐套检查
itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量） itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量）
itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量 itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量
itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量 itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量

10
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java
View File

@ -130,9 +130,10 @@ public class AfterPickmRuleHighpressureRule implements IRule<PMOAggVO> {
// 生产部门 // 生产部门
String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 "; String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 ";
Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor()); Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor());
singleObj.put("bipDeptName", dept.get("name")); // 生产部门 if (!dept.isEmpty()) {
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码 singleObj.put("bipDeptName", dept.get("name")); // 生产部门
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码
}
singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号 singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号 singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号
singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 上级来源单据号 singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 上级来源单据号
@ -168,7 +169,8 @@ public class AfterPickmRuleHighpressureRule implements IRule<PMOAggVO> {
JSONObject itemObj = new JSONObject(); JSONObject itemObj = new JSONObject();
itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID
itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查 // itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查
itemObj.put("bchkitemforwr",item.getBchkitemforwr().booleanValue()?"Y":"N"); // 完工齐套检查
itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量） itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量）
itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量 itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量
itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量 itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量

10
mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
View File

@ -88,9 +88,10 @@ public class SyncGyMesPickmUtil {
// 生产部门 // 生产部门
String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 "; String deptsql = " select code,name from org_dept where pk_dept='" + pickmHeadVO.getCdeptid() + "' and dr=0 ";
Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor()); Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor());
singleObj.put("bipDeptName", dept.get("name")); // 生产部门 if (!dept.isEmpty()) {
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码 singleObj.put("bipDeptName", dept.get("name")); // 生产部门
singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码
}
singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号 singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号 singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号
singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 上级来源单据号 singleObj.put("bipParentProcessProductionOrderId", pickmHeadVO.getVfirstbillcode()); // 上级来源单据号
@ -126,7 +127,8 @@ public class SyncGyMesPickmUtil {
JSONObject itemObj = new JSONObject(); JSONObject itemObj = new JSONObject();
itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID
itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查 // itemObj.put("bchkitemforwr", "Y"); // 完工齐套检查
itemObj.put("bchkitemforwr",item.getBchkitemforwr().booleanValue()?"Y":"N"); // 完工齐套检查
itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量） itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量）
itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量 itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量
itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量 itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量