From 13fbf46634207cbcb4167dfce32f67beafff9466 Mon Sep 17 00:00:00 2001 From: maolei Date: Tue, 3 Jun 2025 19:01:57 +0800 Subject: [PATCH] =?UTF-8?q?ic,mmpac,uapbd:=20=E4=BD=BF=E7=94=A8=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E7=9A=84=E7=BB=84=E7=BB=87=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将原有的硬编码组织代码比较逻辑替换为调用 IHttpPostOtherSys 接口的 checkIfIncludeOrg 方法 - 优化了组织判断逻辑，提高了代码的可维护性和扩展性 - 修改了日志输出内容，使其更加通用和准确 --- .../m4a/sign/rule/AfterSignRuleSyncInToMesProcess.java | 6 +++--- .../m4i/sign/rule/AfterSignRuleSyncOutToMesProcess.java | 7 +++---- .../api/impl/ic/m4d/APIMaterialOutMaintainImpl.java | 9 ++++++--- .../pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java | 4 ++-- .../api/impl/mmbd/bom/APIBomBusinessServiceImpl.java | 7 +++++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ic/src/private/nc/bs/ic/m4a/sign/rule/AfterSignRuleSyncInToMesProcess.java b/ic/src/private/nc/bs/ic/m4a/sign/rule/AfterSignRuleSyncInToMesProcess.java index 9ac008f..93cc0d5 100644 --- a/ic/src/private/nc/bs/ic/m4a/sign/rule/AfterSignRuleSyncInToMesProcess.java +++ b/ic/src/private/nc/bs/ic/m4a/sign/rule/AfterSignRuleSyncInToMesProcess.java @@ -123,9 +123,9 @@ public class AfterSignRuleSyncInToMesProcess implements IRule { String orgCode = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, head.getPk_org()); - if (!Objects.equals(orgCode, "C034")) { - obmlog.debug("ͬɽ̩޹˾,ǰ֯:" + generalInVO.getHead().getPk_org()); - return; // ɽ̩޹˾ + if (!HTTP_POST_OTHER_SYS.checkIfIncludeOrg(orgCode)) { + obmlog.debug("ǰ֯ͬΧ,ǰ֯:" + generalInVO.getHead().getPk_org() + ", ֯:" + orgCode); + return; // Ҫͬ֯ } // // diff --git a/ic/src/private/nc/bs/ic/m4i/sign/rule/AfterSignRuleSyncOutToMesProcess.java b/ic/src/private/nc/bs/ic/m4i/sign/rule/AfterSignRuleSyncOutToMesProcess.java index 2d27305..8e5f33a 100644 --- a/ic/src/private/nc/bs/ic/m4i/sign/rule/AfterSignRuleSyncOutToMesProcess.java +++ b/ic/src/private/nc/bs/ic/m4i/sign/rule/AfterSignRuleSyncOutToMesProcess.java @@ -25,7 +25,6 @@ import java.util.Objects; public class AfterSignRuleSyncOutToMesProcess implements IRule { - public static final IHttpPostOtherSys HTTP_POST_OTHER_SYS = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); private static final String logginfo = "OALOG"; @@ -107,9 +106,9 @@ public class AfterSignRuleSyncOutToMesProcess implements IRule { String orgCode = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, generalOutVO.getHead().getPk_org()); - if (!Objects.equals(orgCode, "C034")) { - obmlog.debug("ͬɽ̩޹˾,ǰ֯:" + generalOutVO.getHead().getPk_org()); - return; // ɽ̩޹˾ + if (!HTTP_POST_OTHER_SYS.checkIfIncludeOrg(orgCode)) { + obmlog.debug("ǰ֯ͬΧ,ǰ֯:" + generalOutVO.getHead().getPk_org() + ", ֯:" + orgCode); + return; // Ҫͬ֯ } String trantypecode = generalOutVO.getHead().getVtrantypecode(); diff --git a/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java b/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java index d489b34..2f67d38 100644 --- a/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java +++ b/ic/src/private/nccloud/api/impl/ic/m4d/APIMaterialOutMaintainImpl.java @@ -31,6 +31,7 @@ import nccloud.api.impl.ic.pub.check.CheckProhibitUpdateFields; import nccloud.openapi.ic.util.ICAPILocationVOUtils; import nccloud.openapi.scmpub.pub.TransferCodeToPKTool; import nccloud.openapi.scmpub.pub.TransferMapToVOTool; +import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -48,6 +49,8 @@ import java.util.*; public class APIMaterialOutMaintainImpl implements IAPIMaterialOutMaintain{ private static final BaseDAO DAO = new BaseDAO(); + + private static final IHttpPostOtherSys HTTP_POST_OTHER_SYS = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); @Override public MaterialOutVO[] save(List> paramList) throws BusinessException { @@ -278,7 +281,7 @@ public class APIMaterialOutMaintainImpl implements IAPIMaterialOutMaintain{ } /** - * ǷC034֯ + * ǷҪͬ֯ */ private boolean checkSpecialCondition(List> materialOutVOS) throws BusinessException { @@ -296,8 +299,8 @@ public class APIMaterialOutMaintainImpl implements IAPIMaterialOutMaintain{ String pkOrg = head.getPk_org(); // code // String orgCode = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_ORG, pkOrg); - // δģԭʼתģֱӱȽ - if("C034".equals(pkOrg)){ + // ʹͳһ֯жϷ + if(HTTP_POST_OTHER_SYS.checkIfIncludeOrg(pkOrg)){ return true; } } diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java index a8d5698..2f8d0cf 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveRuleSyncMes.java @@ -181,11 +181,11 @@ public class AfterApproveRuleSyncMes implements IRule { // String billmaker = aggvo.getParentVO().getBillmaker(); // String userCode = transferCodeByPk("sm_user", UserVO.USER_CODE, UserVO.CUSERID, billmaker); // -// if ("C034".equals(orgCode)&&(!"gaoning".equals(userCode))) { +// if (HTTP_POST_OTHER_SYS.checkIfIncludeOrg(orgCode)&&(!"gaoning".equals(userCode))) { // aggvoList.add(aggvo); // } - if ("C034".equals(orgCode)) { + if (HTTP_POST_OTHER_SYS.checkIfIncludeOrg(orgCode)) { aggvoList.add(aggvo); } } diff --git a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java index a443322..40a7657 100644 --- a/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java +++ b/uapbd/src/private/nccloud/api/impl/mmbd/bom/APIBomBusinessServiceImpl.java @@ -43,6 +43,7 @@ import nc.vo.pubapp.pattern.model.entity.bill.AbstractBill; import nccloud.api.mmbd.bom.IAPIBomBusinessService; import nccloud.api.mmbd.utils.QuerySchemeUtils; import nccloud.api.rest.utils.ResultMessageUtil; +import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; import nccloud.vo.bd.bom.bom0202.validate.BomSavingValidation; import org.json.JSONString; @@ -54,6 +55,8 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService { // 2025528 ֯˼άBOM汾Զ㴦 private static final BaseDAO DAO = new BaseDAO(); + + private static final IHttpPostOtherSys HTTP_POST_OTHER_SYS = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); private static String HEADTABLE = "bd_bom"; @@ -1563,8 +1566,8 @@ public class APIBomBusinessServiceImpl implements IAPIBomBusinessService { param.addParam(pk_org); String orgCode = (String) DAO.executeQuery(sql, param, new ColumnProcessor()); - // ж֯ǷΪC034 - boolean isCableOrg = "C034".equals(orgCode); + // ʹͳһ֯жϷ + boolean isCableOrg = HTTP_POST_OTHER_SYS.checkIfIncludeOrg(orgCode); // жϱעǷ"˼ά" boolean containsJinSiWei = MMValueCheck.isNotEmpty(hvnote) && hvnote.contains("˼ά");