From c895e9c26c1de66afdd8ac97bb1b5e8d883e91be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?= Date: Fri, 23 May 2025 08:41:37 +0800 Subject: [PATCH] =?UTF-8?q?5=E5=8D=95=E6=8D=AE=E6=8E=A8=E9=80=81=E9=94=90?= =?UTF-8?q?=E5=88=B6=E4=BC=98=E5=8C=96=E8=A1=A8=E4=BD=93=E7=A9=BA=5FV3=5Fs?= =?UTF-8?q?dlizheng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java | 2 +- .../nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java | 2 +- .../nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java | 2 +- .../pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java | 2 +- .../action/rule/approve/AfterApprovingSynchronizeRuleRZ.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arap/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java b/arap/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java index 717ba68..50a850b 100644 --- a/arap/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java +++ b/arap/src/private/nc/bs/sc/m61/referred/rule/pm/AfterApproceRuleSyncRZWMSProcess.java @@ -125,7 +125,7 @@ public class AfterApproceRuleSyncRZWMSProcess implements IRule { String pkOrg = aggvo.getParentVO().getPk_org(); Integer fstatusflag = aggvo.getParentVO().getFstatusflag(); String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - if ("C022".equals(orgCode) && 3 == fstatusflag) { + if ("C022".equals(orgCode) && 3 == fstatusflag&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length>0) { aggvoList.add(aggvo); } } diff --git a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java index 0fe84f9..24afad7 100644 --- a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java +++ b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleRZ.java @@ -60,7 +60,7 @@ public class AfterSigningSynchronizeRuleRZ implements IRule { for(SaleOutVO aggvo:saleOutVOS){ String pkOrg = aggvo.getHead().getPk_org(); String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - if("C022".equals(orgCode)){ + if("C022".equals(orgCode)&& aggvo.getBodys()!=null && aggvo.getBodys().length>0){ aggvoList.add(aggvo); } } diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java index 5e3db68..80f212a 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java @@ -99,7 +99,7 @@ public class AfterApproveRuleSyncRZWMS implements IRule { for (AggPickmVO aggvo : aggPickmVOS) { String pkOrg = aggvo.getParentVO().getPk_org(); String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - if ("C022".equals(orgCode)) { + if ("C022".equals(orgCode)&& 1 == aggvo.getParentVO().getFbillstatus()&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length > 0) { aggvoList.add(aggvo); } } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java index e252a75..6664064 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java @@ -61,7 +61,7 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { String pkOrg = aggvo.getParentVO().getPk_org(); Integer fbillstatus = aggvo.getParentVO().getFbillstatus(); String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - if ("C022".equals(orgCode) && 1 == fbillstatus) { + if ("C022".equals(orgCode) && 1 == fbillstatus&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length>0) { aggvoList.add(aggvo); } } diff --git a/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java b/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java index cf0d68f..fe953a0 100644 --- a/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java +++ b/pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java @@ -65,7 +65,7 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule { String pkOrg = aggvo.getHVO().getPk_org(); Integer forderstatus = aggvo.getHVO().getForderstatus(); String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg); - if ("C022".equals(orgCode) && 3 == forderstatus) { + if ("C022".equals(orgCode) && 3 == forderstatus && aggvo.getBVO()!=null && aggvo.getBVO().length > 0) { aggvoList.add(aggvo); } }