From cffbf2577db11d5ccb5a8fd50ca017f358cfe25a Mon Sep 17 00:00:00 2001 From: lihao Date: Tue, 2 Sep 2025 18:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E4=B8=8B?= =?UTF-8?q?=E8=BE=BE=E7=94=9F=E4=BA=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../private/nc/bs/mmpac/pmo/pac0002/bp/PMOInsertBP.java | 3 +++ .../pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java | 8 ++++++-- .../bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOInsertBP.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOInsertBP.java index ba76e5c..acab6ec 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOInsertBP.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/PMOInsertBP.java @@ -1,5 +1,6 @@ package nc.bs.mmpac.pmo.pac0002.bp; +import nc.bs.mmpac.pmo.pac0002.bp.rule.AfterApproveSyncPLMRule; import nc.bs.mmpac.pmo.pac0002.bp.rule.BeforePmoBomRule; import nc.bs.mmpac.pmo.pac0002.bp.rule.saveBeforeCheckRule; import nc.bs.mmpac.pmo.pac0002.pluginpoint.PMOPluginPoint; @@ -303,6 +304,8 @@ public class PMOInsertBP { IRule saveapproverule = new PMOInsertSaveApproveRule(); processer.addAfterRule(saveapproverule); + // 审批后推送流程生产订单到PLM + processer.addAfterRule(new AfterApproveSyncPLMRule()); } public PMOAggVO[] pushInsert(PMOAggVO[] vos, boolean issub, String pushtype) { diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java index 6dbe958..06846e3 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java @@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import nc.bs.dao.BaseDAO; import nc.bs.dao.DAOException; +import nc.bs.framework.common.InvocationInfoProxy; import nc.bs.logging.Log; import nc.bs.trade.business.HYPubBO; import nc.bs.trade.business.HYSuperDMO; @@ -162,16 +163,19 @@ public class AfterApproveSyncPLMRule implements IRule { private List checkAndFilterBillSrcOrg(PMOAggVO[] cloneOrderVOS) throws BusinessException, IOException { List filteredOrders = new ArrayList(); - + HYPubBO hybo = new HYPubBO(); for (PMOAggVO pmoAggVO : cloneOrderVOS) { ; String pkOrg = pmoAggVO.getParentVO().getPk_org(); String orgCode = MyHelper.transferField(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); // 妫鏌ュ綋鍓嶇粍缁囨槸鍚︿负鐢靛姏鐢靛瓙 + if (MyHelper.checkIfDldzOrg(orgCode, configParams)) { continue; } - if(pmoAggVO.getParentVO().getVtrantypecode().equals("55A2-Cxx-08")){ + Object pk_billtypecode=hybo.findColValue("bd_billtype","pk_billtypecode"," istransaction = 'Y' and nvl ( islock, 'N' ) = 'N' and parentbilltype = '55A2' and pk_group = '" + + InvocationInfoProxy.getInstance().getGroupId() + "' and pk_billtypeid = '" + pmoAggVO.getParentVO().getCtrantypeid() + "' "); + if(pk_billtypecode.equals("55A2-Cxx-08")){ filteredOrders.add(pmoAggVO); } } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java index 807e40f..52fe97c 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java @@ -6,6 +6,7 @@ package nc.bs.mmpac.pmo.pac0002.bp.rule; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -42,6 +43,10 @@ public class WithUpdatePickmRule implements IRule { for (PMOItemVO praybillItemVO : praybillItemVOS) { if("55A3".equals(praybillItemVO.getVsrctype())){ pk.add(praybillItemVO.getVsrcbid()); + Map updateMap = new HashMap(); + updateMap.put("pk",praybillItemVO.getVsrcbid()); + updateMap.put("num",praybillItemVO.getNastnum()); + updateList.add(updateMap); } } }