电力电子-流程生产订单和BOM跳过期初
This commit is contained in:
parent
6c2d331de9
commit
ae95edbd61
|
|
@ -22,6 +22,7 @@ import nc.vo.pubapp.pattern.exception.ExceptionUtils;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 流程生产订单删除后同步艾普MES
|
* 流程生产订单删除后同步艾普MES
|
||||||
|
|
@ -66,7 +67,16 @@ public class AfterDelSyncEpicMesRule implements IRule<PMOAggVO> {
|
||||||
// logDl.info("开始同步生产订单到艾普MES系统,符合条件的订单数量: " + filteredOrders.size());
|
// logDl.info("开始同步生产订单到艾普MES系统,符合条件的订单数量: " + filteredOrders.size());
|
||||||
JSONArray jsonArray = new JSONArray();
|
JSONArray jsonArray = new JSONArray();
|
||||||
// 推送到艾普MES系统
|
// 推送到艾普MES系统
|
||||||
|
Set<String> billTypeCodes = Set.of(
|
||||||
|
"55A2-Cxx-01", "55A2-Cxx-18"
|
||||||
|
);
|
||||||
for (PMOAggVO aggVO : filteredOrders) {
|
for (PMOAggVO aggVO : filteredOrders) {
|
||||||
|
PMOHeadVO headVo = aggVO.getParentVO();
|
||||||
|
// 判断订单类型,期初订单不处理
|
||||||
|
String vtrantypecode = headVo.getVtrantypecode();
|
||||||
|
if (billTypeCodes.contains(vtrantypecode)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
buildSyncData(aggVO, jsonArray);
|
buildSyncData(aggVO, jsonArray);
|
||||||
}
|
}
|
||||||
if (!jsonArray.isEmpty()) {
|
if (!jsonArray.isEmpty()) {
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ import nccloud.commons.lang.StringUtils;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 流程生产订单审批后推送艾普MES
|
* 流程生产订单审批后推送艾普MES
|
||||||
|
|
@ -67,10 +68,18 @@ public class SyncEpicMesUtil {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
logDl.info("开始同步生产订单到艾普MES系统,符合条件的订单数量: " + filteredOrders.size());
|
logDl.info("开始同步生产订单到艾普MES系统,符合条件的订单数量: " + filteredOrders.size());
|
||||||
|
Set<String> billTypeCodes = Set.of(
|
||||||
|
"55A2-Cxx-01", "55A2-Cxx-18"
|
||||||
|
);
|
||||||
JSONArray jsonArray = new JSONArray();
|
JSONArray jsonArray = new JSONArray();
|
||||||
// 推送到艾普MES系统
|
// 推送到艾普MES系统
|
||||||
for (PMOAggVO aggVO : filteredOrders) {
|
for (PMOAggVO aggVO : filteredOrders) {
|
||||||
PMOHeadVO head = aggVO.getParentVO();
|
PMOHeadVO head = aggVO.getParentVO();
|
||||||
|
// 判断订单类型,期初订单不处理
|
||||||
|
String vtrantypecode = head.getVtrantypecode();
|
||||||
|
if (billTypeCodes.contains(vtrantypecode)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
PMOItemVO[] bodys = aggVO.getChildrenVO();
|
PMOItemVO[] bodys = aggVO.getChildrenVO();
|
||||||
if (bodys == null || bodys.length == 0) {
|
if (bodys == null || bodys.length == 0) {
|
||||||
logDl.error("生产订单 " + head.getVbillcode() + " 没有行信息,跳过同步。");
|
logDl.error("生产订单 " + head.getVbillcode() + " 没有行信息,跳过同步。");
|
||||||
|
|
@ -93,7 +102,6 @@ public class SyncEpicMesUtil {
|
||||||
pushData(codeUrl, jsonArray);
|
pushData(codeUrl, jsonArray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
logDl.info("生产订单同步到艾普MES系统处理完成。");
|
logDl.info("生产订单同步到艾普MES系统处理完成。");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,11 @@ public class BomSaveAfterEpicMesRule implements IRule<AggBomVO> {
|
||||||
for (AggBomVO vo : useVOs) {
|
for (AggBomVO vo : useVOs) {
|
||||||
// 判断物料的业务单元是否是电力电子公司,不是则跳过
|
// 判断物料的业务单元是否是电力电子公司,不是则跳过
|
||||||
BomVO hvo = (BomVO) vo.getParentVO();
|
BomVO hvo = (BomVO) vo.getParentVO();
|
||||||
|
String hvnote = hvo.getHvnote();
|
||||||
|
// 跳过期初的BOM
|
||||||
|
if ("202509QC".equals(hvnote)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
String pkOrg = (String) hvo.getAttributeValue("pk_org");
|
String pkOrg = (String) hvo.getAttributeValue("pk_org");
|
||||||
String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
|
String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
|
||||||
if (MyHelper.checkIfDldzOrg(orgCode, configParams)) {
|
if (MyHelper.checkIfDldzOrg(orgCode, configParams)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue