From 7ce829f8b5b7819d89405b55f43c780287e7e6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=8E?= <125556714+Topfunplus@users.noreply.github.com> Date: Tue, 3 Jun 2025 18:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=20MES=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 IHttpPostOtherSys 实例化移至类级别，避免重复创建- 替换静态方法调用为接口方法，提高代码可维护性 - 优化部分代码结构，提高可读性 --- .../rule/AfterSigningSynchronizeRuleMES.java | 7 +++---- .../m45/sign/rule/PurchaseReceiptRuleMES.java | 9 +++------ .../rule/AfterSigningSynchronizeRuleMES.java | 15 ++------------- .../sign/rule/SalesDeliveryOrderRuleMES.java | 19 ++----------------- .../AfterApprovingSynchronizeRuleMES.java | 8 ++------ .../plugin/BatchTransferToPurchaseOrder.java | 8 ++------ .../AfterApprovingSynchronizeRuleMES.java | 13 +++---------- 7 files changed, 17 insertions(+), 62 deletions(-) diff --git a/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java b/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java index 916c364..b0c6513 100644 --- a/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java +++ b/ic/src/private/nc/bs/ic/m45/sign/rule/AfterSigningSynchronizeRuleMES.java @@ -27,7 +27,6 @@ import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; import java.util.ArrayList; import java.util.List; -import static nccloud.pubift.commen.impl.utils.HttpPostOtherSysImpl.checkIfIncludeOrg; /** * ɹǩֺͬMES @@ -41,12 +40,12 @@ public class AfterSigningSynchronizeRuleMES implements IRule { private static final String logginfo = "OALOG"; private static final Log obmlog = Log.getInstance(logginfo); private static final BaseDAO dao = new BaseDAO(); + // ʼHTTP󹤾 + IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); @Override public void process(PurchaseInVO[] purchaseInVOs) { try { - // ʼHTTP󹤾 - IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); if (purchaseInVOs == null || purchaseInVOs.length == 0) { obmlog.debug("AfterSigningSynchronizeRuleMES-ɹͬMES-޲ɹⵥ"); return; @@ -140,7 +139,7 @@ public class AfterSigningSynchronizeRuleMES implements IRule { for (PurchaseInVO vo : purchaseInVOS) { try { String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); - if (checkIfIncludeOrg(code)) { + if (httpPostOtherSys.checkIfIncludeOrg(code)) { result.add(vo); } } catch (BusinessException e) { diff --git a/ic/src/private/nc/bs/ic/m45/sign/rule/PurchaseReceiptRuleMES.java b/ic/src/private/nc/bs/ic/m45/sign/rule/PurchaseReceiptRuleMES.java index cb16d1c..b4dba0e 100644 --- a/ic/src/private/nc/bs/ic/m45/sign/rule/PurchaseReceiptRuleMES.java +++ b/ic/src/private/nc/bs/ic/m45/sign/rule/PurchaseReceiptRuleMES.java @@ -6,7 +6,6 @@ import nc.bs.dao.BaseDAO; import nc.bs.framework.common.NCLocator; import nc.bs.logging.Log; import nc.impl.pubapp.pattern.rule.IRule; -import nc.itf.arap.goldentax.SysParaInitQuery; import nc.jdbc.framework.processor.ColumnProcessor; import nc.vo.bd.material.MaterialVO; import nc.vo.bd.material.measdoc.MeasdocVO; @@ -31,8 +30,6 @@ import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; -import static nccloud.pubift.commen.impl.utils.HttpPostOtherSysImpl.checkIfIncludeOrg; - /** * (ǰ)ɹջMESϵͳ,òɹ */ @@ -42,12 +39,12 @@ public class PurchaseReceiptRuleMES implements IRule { private static final String logginfo = "OALOG"; private static final Log obmlog = Log.getInstance(logginfo); private static final BaseDAO dao = new BaseDAO(); + // ʼHTTP󹤾 + IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); @Override public void process(PurchaseInVO[] purchaseInVOS) { try { - // ʼHTTP󹤾 - IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); if (purchaseInVOS == null || purchaseInVOS.length == 0) { obmlog.debug("AfterSigningSynchronizeRuleMES-ûҪIJɹջ"); return; @@ -133,7 +130,7 @@ public class PurchaseReceiptRuleMES implements IRule { for (PurchaseInVO vo : purchaseInVOS) { try { String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); - if (checkIfIncludeOrg(code)) { + if (httpPostOtherSys.checkIfIncludeOrg(code)) { result.add(vo); } } catch (BusinessException e) { diff --git a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java index 3165323..b49ed89 100644 --- a/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java +++ b/ic/src/private/nc/bs/ic/m4c/sign/rule/AfterSigningSynchronizeRuleMES.java @@ -2,14 +2,11 @@ package nc.bs.ic.m4c.sign.rule; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.yonyou.cloud.utils.StringUtils; import nc.bs.dao.BaseDAO; import nc.bs.framework.common.NCLocator; import nc.bs.logging.Log; import nc.impl.pubapp.pattern.rule.IRule; -import nc.itf.arap.goldentax.SysParaInitQuery; import nc.jdbc.framework.processor.ColumnProcessor; -import nc.vo.bd.currtype.CurrtypeVO; import nc.vo.bd.cust.CustomerVO; import nc.vo.bd.material.MaterialVO; import nc.vo.bd.material.measdoc.MeasdocVO; @@ -17,12 +14,9 @@ import nc.vo.bd.psn.PsndocVO; import nc.vo.bd.rack.RackVO; import nc.vo.bd.stordoc.StordocVO; import nc.vo.bd.supplier.SupplierVO; -import nc.vo.ic.m45.entity.PurchaseInVO; import nc.vo.ic.m4c.entity.SaleOutBodyVO; import nc.vo.ic.m4c.entity.SaleOutHeadVO; import nc.vo.ic.m4c.entity.SaleOutVO; -import nc.vo.org.DeptVO; -import nc.vo.org.SalesOrgVO; import nc.vo.org.StockOrgVO; import nc.vo.pub.BusinessException; import nc.vo.pub.lang.UFDate; @@ -30,16 +24,12 @@ import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.pub.SqlBuilder; import nc.vo.vorg.DeptVersionVO; import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; -import net.sf.mpxj.primavera.schema.CurrencyType; import java.math.BigDecimal; import java.math.RoundingMode; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; -import static nccloud.pubift.commen.impl.utils.HttpPostOtherSysImpl.checkIfIncludeOrg; - /** * ۳⣨ǩֺMES˼άϵͳ @@ -48,6 +38,7 @@ public class AfterSigningSynchronizeRuleMES implements IRule { private static final String SALE_OUT_URL = "/GTHINKING/AjaxService/N_KCSJJS/101527003.ashx/gt_rec_api_xsckdj"; // ۳Ǽǽӿ private static final Log obmlog = Log.getInstance("OALOG"); private static final BaseDAO dao = new BaseDAO(); + IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); public AfterSigningSynchronizeRuleMES() { } @@ -55,8 +46,6 @@ public class AfterSigningSynchronizeRuleMES implements IRule { @Override public void process(SaleOutVO[] saleOutVOS) { try { - // ʼHTTP󹤾 - IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); if (saleOutVOS == null || saleOutVOS.length == 0) { obmlog.debug("AfterSigningSynchronizeRule-ûҪ۳ⵥ."); return; @@ -196,7 +185,7 @@ public class AfterSigningSynchronizeRuleMES implements IRule { for (SaleOutVO vo : saleOutVOS) { try { String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); - if (checkIfIncludeOrg(code)) { + if (httpPostOtherSys.checkIfIncludeOrg(code)) { result.add(vo); } } catch (BusinessException e) { diff --git a/ic/src/private/nc/bs/ic/m4c/sign/rule/SalesDeliveryOrderRuleMES.java b/ic/src/private/nc/bs/ic/m4c/sign/rule/SalesDeliveryOrderRuleMES.java index d840361..b77dcca 100644 --- a/ic/src/private/nc/bs/ic/m4c/sign/rule/SalesDeliveryOrderRuleMES.java +++ b/ic/src/private/nc/bs/ic/m4c/sign/rule/SalesDeliveryOrderRuleMES.java @@ -6,15 +6,12 @@ import nc.bs.dao.BaseDAO; import nc.bs.framework.common.NCLocator; import nc.bs.logging.Log; import nc.impl.pubapp.pattern.rule.IRule; -import nc.itf.arap.goldentax.SysParaInitQuery; import nc.jdbc.framework.processor.ColumnProcessor; -import nc.vo.bd.currtype.CurrtypeVO; import nc.vo.bd.cust.CustomerVO; import nc.vo.bd.material.MaterialVO; import nc.vo.bd.material.measdoc.MeasdocVO; import nc.vo.bd.psn.PsndocVO; import nc.vo.bd.stordoc.StordocVO; -import nc.vo.ic.m45.entity.PurchaseInVO; import nc.vo.ic.m4c.entity.SaleOutBodyVO; import nc.vo.ic.m4c.entity.SaleOutHeadVO; import nc.vo.ic.m4c.entity.SaleOutVO; @@ -30,8 +27,6 @@ import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; -import static nccloud.pubift.commen.impl.utils.HttpPostOtherSysImpl.checkIfIncludeOrg; - /** * (ǰ)۽(BIP) MES @@ -43,12 +38,11 @@ public class SalesDeliveryOrderRuleMES implements IRule { // ɾ۽ӿڵַ private static final String MES_DELETE_API_URL = "/GTHINKING/AjaxService/N_XSSJJSA/102397002.ashx/SOTH_DELETE"; private static final Log obmlog = Log.getInstance("OALOG"); + IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); @Override public void process(SaleOutVO[] saleOutVOS) { try { - // ʼHTTP󹤾 - IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); if (saleOutVOS == null || saleOutVOS.length == 0) { obmlog.info("SalesDeliveryOrderRuleMES-ûҪд۽"); return; @@ -198,32 +192,23 @@ public class SalesDeliveryOrderRuleMES implements IRule { if (orderNo == null || orderNo.trim().isEmpty()) { throw new BusinessException("۽ŲΪ"); } - obmlog.debug("SalesDeliveryOrderRuleMES-׼ɾϵͳ۽: " + orderNo); - // JSONObject requestData = new JSONObject(); JSONObject dataObj = new JSONObject(); dataObj.put("orderNo", orderNo); requestData.put("Data", dataObj); - - // ʼHTTP󹤾 - IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); - // ɾ String response = httpPostOtherSys.callMes(MES_DELETE_API_URL, requestData); obmlog.debug("SalesDeliveryOrderRuleMES-ɾ󷵻ؽ: " + response); - // ؽ JSONObject jsonResponse = JSONObject.parseObject(response); boolean isSuccess = jsonResponse.getBooleanValue("Success"); String errorMessage = jsonResponse.getString("ErrorMessage"); - if (!isSuccess) { obmlog.error("SalesDeliveryOrderRuleMES-ɾ۽ʧ: " + orderNo + ", Ϣ: " + errorMessage); throw new BusinessException("ɾ۽ʧ: " + (errorMessage != null ? errorMessage : "δ֪")); } - obmlog.debug("SalesDeliveryOrderRuleMES-ɹɾ۽: " + orderNo); return true; } catch (Exception e) { @@ -240,7 +225,7 @@ public class SalesDeliveryOrderRuleMES implements IRule { for (SaleOutVO vo : saleOutVOS) { try { String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); - if (checkIfIncludeOrg(code)) { + if (httpPostOtherSys.checkIfIncludeOrg(code)) { result.add(vo); } } catch (BusinessException e) { diff --git a/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRuleMES.java b/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRuleMES.java index aa8554a..b1b6441 100644 --- a/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRuleMES.java +++ b/ic/src/private/nc/bs/ic/m4r/approve/rule/AfterApprovingSynchronizeRuleMES.java @@ -7,7 +7,6 @@ import nc.bs.dao.BaseDAO; import nc.bs.framework.common.NCLocator; import nc.bs.logging.Log; import nc.impl.pubapp.pattern.rule.IRule; -import nc.itf.arap.goldentax.SysParaInitQuery; import nc.jdbc.framework.processor.ColumnProcessor; import nc.vo.bd.cust.CustomerVO; import nc.vo.bd.material.MaterialVO; @@ -25,11 +24,9 @@ import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.pub.SqlBuilder; import nc.vo.vorg.DeptVersionVO; import nccloud.pubift.commen.itf.utils.IHttpPostOtherSys; - import java.util.ArrayList; import java.util.List; -import static nccloud.pubift.commen.impl.utils.HttpPostOtherSysImpl.checkIfIncludeOrg; /** @@ -40,6 +37,7 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { private static final String logginfo = "OALOG"; private static final Log obmlog = Log.getInstance(logginfo); private static final BaseDAO dao = new BaseDAO(); + IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); public AfterApprovingSynchronizeRuleMES() { } @@ -47,8 +45,6 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { @Override public void process(InvCountBillVO[] invCountBillVOs) { try { - // ʼHTTP󹤾 - IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); if (invCountBillVOs == null || invCountBillVOs.length == 0) { obmlog.debug("AfterApprovingSynchronizeRule-ûҪ̵"); return; @@ -82,7 +78,7 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { for (InvCountBillVO vo : invCountBillVOS) { try { String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); - if (checkIfIncludeOrg(code)) { + if (httpPostOtherSys.checkIfIncludeOrg(code)) { result.add(vo); } } catch (BusinessException e) { diff --git a/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java b/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java index 8642b25..df5ad4c 100644 --- a/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java +++ b/pu/src/private/nc/bs/pu/m21/plugin/BatchTransferToPurchaseOrder.java @@ -55,7 +55,6 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin { logger.info("ת빺ɹ", this.getClass(), "executeTask"); } catch (Exception e) { logger.error("ִת빺ɹʧ", e, this.getClass(), "executeTask"); - ExceptionUtils.marsh(e); } logger.info("ת빺ɹִ", this.getClass(), "executeTask"); return retObj; @@ -204,13 +203,12 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin { Arrays.stream(vos).forEach(currentVO -> { PraybillHeaderVO hvo = currentVO.getHVO(); hvo.setVdef30("success"); - hvo.setVdef31("N"); + hvo.setVdef31("Y"); hvo.setStatus(VOStatus.UPDATED); }); if (orderVOs.length == 1) { PraybillVO singleVO = vos[0]; PraybillHeaderVO singleHVO = singleVO.getHVO(); - SCMScriptResultDTO scriptResult = null; try { (NCLocator.getInstance().lookup(IBatchRunScriptService.class)).runBacth(cloudContext, OrderVO.class); } catch (Exception e) { @@ -240,9 +238,7 @@ public class BatchTransferToPurchaseOrder implements IBackgroundWorkPlugin { logger.warn("תɲɹʱ: " + scriptResult.getErrorMessage(), this.getClass(), "processBatchTransfer"); }); } - if (!failedHVOList.isEmpty()) { - updatePrayBillVOs(failedHVOList); - } + updatePrayBillVOs(failedHVOList); } private void updatePrayBillVOs(List hvoList) { diff --git a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java index bba4a01..bd20ee4 100644 --- a/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java +++ b/so/src/private/nc/bs/so/m30/rule/approve/AfterApprovingSynchronizeRuleMES.java @@ -1,17 +1,12 @@ package nc.bs.so.m30.rule.approve; -import bsh.StringUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import nc.bs.dao.BaseDAO; -import nc.bs.framework.common.InvocationInfoProxy; import nc.bs.framework.common.NCLocator; import nc.bs.logging.Log; -import nc.hr.utils.PubEnv; import nc.impl.pubapp.pattern.rule.IRule; -import nc.itf.arap.goldentax.SysParaInitQuery; import nc.jdbc.framework.processor.ColumnProcessor; -import nc.vo.am.common.util.StringUtils; import nc.vo.bd.balatype.BalaTypeVO; import nc.vo.bd.currtype.CurrtypeVO; import nc.vo.bd.cust.CustomerVO; @@ -36,8 +31,6 @@ import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; -import static nccloud.pubift.commen.impl.utils.HttpPostOtherSysImpl.checkIfIncludeOrg; - /** * ۶MES˼άϵͳ */ @@ -46,14 +39,14 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { private static final String logginfo = "OALOG"; private static final Log obmlog = Log.getInstance(logginfo); private static final BaseDAO dao = new BaseDAO(); + // ʼHTTP󹤾 + IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); public AfterApprovingSynchronizeRuleMES() { } @Override public void process(SaleOrderVO[] saleOrderVOs) { - // ʼHTTP󹤾 - IHttpPostOtherSys httpPostOtherSys = NCLocator.getInstance().lookup(IHttpPostOtherSys.class); try { if (saleOrderVOs == null || saleOrderVOs.length == 0) { obmlog.debug("AfterApprovingSynchronizeRuleMES-ûҪ۶"); @@ -238,7 +231,7 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { for (SaleOrderVO vo : saleOutVOS) { try { String code = transferCodeByPk(SalesOrgVO.getDefaultTableName(), SalesOrgVO.CODE, SalesOrgVO.PK_SALESORG, vo.getParentVO().getPk_org()); - if (checkIfIncludeOrg(code)) { + if (httpPostOtherSys.checkIfIncludeOrg(code)) { result.add(vo); } } catch (BusinessException e) {