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;