yonyou
/
taikai2312
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

互感器采购订单_生产订单_备料计划过滤期初数据

This commit is contained in:
李正@用友 2025-07-01 15:13:02 +08:00 committed by mzr
parent bf23623f91
commit 6fa77b662d
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleSyncRZWMS.java
View File

@ -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;
}

18
mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApprovingSynchronizeRuleRZ.java
View File

@ -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;
}

7
pu/src/private/nc/bs/pu/m21/action/rule/approve/AfterApprovingSynchronizeRuleRZ.java
View File

@ -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;