From 6fa77b662d3c747a664f25fad3dc386a22d2611c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=AD=A3=40=E7=94=A8=E5=8F=8B?=
 <sdlizheng@yonyou.com>
Date: Tue, 1 Jul 2025 15:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=92=E6=84=9F=E5=99=A8=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=5F=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=5F?=
 =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=E8=BF=87=E6=BB=A4=E6=9C=9F?=
 =?UTF-8?q?=E5=88=9D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bp/rule/AfterApproveRuleSyncRZWMS.java     | 10 +++++++---
 .../rule/AfterApprovingSynchronizeRuleRZ.java  | 18 ++++++++++--------
 .../AfterApprovingSynchronizeRuleRZ.java       |  7 +++++--
 3 files changed, 22 insertions(+), 13 deletions(-)

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 2c70608..44eadb8 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
@@ -193,11 +193,15 @@ public class AfterApproveRuleSyncRZWMS implements IRule<AggPickmVO> {
             String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
             //过滤上游不是生产订单和委外订单的备料计划
             String vfirstbilltype = aggvo.getParentVO().getVfirstbilltype();
-            if ("C022".equals(orgCode)&& 1 == aggvo.getParentVO().getFbillstatus()&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length > 0) {
-                if("61".equals(vfirstbilltype)||"55A2".equals(vfirstbilltype)){
-                    aggvoList.add(aggvo);
+            String vdef20 = aggvo.getParentVO().getVdef20();
+            if(vdef20==null||"N".equals(vdef20)){
+                if ("C022".equals(orgCode)&& 1 == aggvo.getParentVO().getFbillstatus()&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length > 0) {
+                    if("61".equals(vfirstbilltype)||"55A2".equals(vfirstbilltype)){
+                        aggvoList.add(aggvo);
+                    }
                 }
             }
+
         }
         return aggvoList;
     }
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 58448c2..359e194 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
@@ -84,16 +84,18 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule<PMOAggVO> {
             Integer fbillstatus = aggvo.getParentVO().getFbillstatus();
             String tranid = aggvo.getParentVO().getCtrantypeid();
             String orgCode = transferCodeByPk(OrgVO.getDefaultTableName(), OrgVO.CODE, OrgVO.PK_ORG, pkOrg);
-            if(this.flag){
-                if ("C022".equals(orgCode) && 1 == fbillstatus&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length>0) {
-                    aggvoList.add(aggvo);
-                }
-            }else{
-                if ("C022".equals(orgCode)&& 1 == fbillstatus&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length > 0 && !bSaveApproveMap.isEmpty()&&!bSaveApproveMap.getOrDefault(tranid, UFBoolean.FALSE).booleanValue()) {
-                    aggvoList.add(aggvo);
+            String vtrantypecode = aggvo.getParentVO().getVtrantypecode();
+            if(!"55A2-Cxx-01".equals(vtrantypecode)){
+                if(this.flag){
+                    if ("C022".equals(orgCode) && 1 == fbillstatus&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length>0) {
+                        aggvoList.add(aggvo);
+                    }
+                }else{
+                    if ("C022".equals(orgCode)&& 1 == fbillstatus&&aggvo.getChildrenVO()!=null && aggvo.getChildrenVO().length > 0 && !bSaveApproveMap.isEmpty()&&!bSaveApproveMap.getOrDefault(tranid, UFBoolean.FALSE).booleanValue()) {
+                        aggvoList.add(aggvo);
+                    }
                 }
             }
-
         }
         return aggvoList;
     }
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 8bef2c0..514a1ec 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
@@ -66,8 +66,11 @@ public class AfterApprovingSynchronizeRuleRZ implements IRule<OrderVO> {
             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 && aggvo.getBVO()!=null && aggvo.getBVO().length > 0) {
-                aggvoList.add(aggvo);
+            String vdef20 = aggvo.getHVO().getVdef20();
+            if(vdef20==null||"N".equals(vdef20)){
+                if ("C022".equals(orgCode) && 3 == forderstatus && aggvo.getBVO()!=null && aggvo.getBVO().length > 0) {
+                    aggvoList.add(aggvo);
+                }
             }
         }
         return aggvoList;