From 57be63bfa41a0c7293fcf168a6eadb08a84a56dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=98=8E?= <125556714+Topfunplus@users.noreply.github.com> Date: Thu, 22 May 2025 09:11:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=BA=93=E5=AD=98=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=88=96=E9=94=80=E5=94=AE=E7=BB=84=E7=BB=87=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E4=B8=BAC034=E7=9A=84=E7=BB=84=E7=BB=87=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rule/AfterSigningSynchronizeRuleMES.java | 17 ++++++++++++++--- .../m45/sign/rule/PurchaseReceiptRuleMES.java | 17 ++++++++++++++--- .../rule/AfterSigningSynchronizeRuleMES.java | 17 ++++++++++++++--- .../sign/rule/SalesDeliveryOrderRuleMES.java | 16 +++++++++++++--- .../rule/AfterApprovingSynchronizeRuleMES.java | 16 +++++++++++++--- .../AfterApprovingSynchronizeRuleMES.java | 14 ++++++++++++-- 6 files changed, 80 insertions(+), 17 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 ded2051..b9a2609 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 @@ -14,6 +14,7 @@ import nc.vo.bd.supplier.SupplierVO; import nc.vo.ic.m45.entity.PurchaseInBodyVO; import nc.vo.ic.m45.entity.PurchaseInHeadVO; import nc.vo.ic.m45.entity.PurchaseInVO; +import nc.vo.org.StockOrgVO; import nc.vo.pub.BusinessException; import nc.vo.pub.lang.UFDate; import nc.vo.pub.lang.UFDouble; @@ -131,12 +132,22 @@ public class AfterSigningSynchronizeRuleMES implements IRule { /** * 检查并筛选需要同步的单据 */ - private List checkAndFilterBills(PurchaseInVO[] purchaseInVOS) throws BusinessException { + private List checkAndFilterBills(PurchaseInVO[] purchaseInVOS) { List result = new ArrayList<>(); for (PurchaseInVO vo : purchaseInVOS) { // 检查组织是否为电缆组织 - if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { - result.add(vo); +// if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { +// result.add(vo); +// } + + try { + String targetCode = "C034"; + String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); + if (code != null && code.equals(targetCode)) { + result.add(vo); + } + } catch (BusinessException e) { + ExceptionUtils.wrappBusinessException("查询组织时发生错误"); } } return result; 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 d84374e..05b17d6 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 @@ -16,6 +16,7 @@ import nc.vo.cmp.util.StringUtils; import nc.vo.ic.m45.entity.PurchaseInVO; import nc.vo.ic.m45.entity.PurchaseInBodyVO; import nc.vo.ic.m45.entity.PurchaseInHeadVO; +import nc.vo.org.StockOrgVO; import nc.vo.pub.BusinessException; import nc.vo.pub.lang.UFDate; import nc.vo.pub.lang.UFDouble; @@ -124,12 +125,22 @@ public class PurchaseReceiptRuleMES implements IRule { /** * 检查并筛选需要同步的单据 */ - private List checkAndFilterBills(PurchaseInVO[] purchaseInVOS) throws BusinessException { + private List checkAndFilterBills(PurchaseInVO[] purchaseInVOS) { List result = new ArrayList<>(); for (PurchaseInVO vo : purchaseInVOS) { // 检查组织是否为电缆组织 - if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { - result.add(vo); +// if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { +// result.add(vo); +// } + + try { + String targetCode = "C034"; + String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); + if (code != null && code.equals(targetCode)) { + result.add(vo); + } + } catch (BusinessException e) { + ExceptionUtils.wrappBusinessException("查询组织时发生错误"); } } return result; 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 6689dc0..aa86500 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 @@ -21,6 +21,8 @@ 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; import nc.vo.pubapp.pattern.exception.ExceptionUtils; @@ -186,12 +188,21 @@ public class AfterSigningSynchronizeRuleMES implements IRule { /** * 检查并筛选需要同步的单据 */ - private List checkAndFilterBills(SaleOutVO[] saleOutVOS) throws BusinessException { + private List checkAndFilterBills(SaleOutVO[] saleOutVOS) { List result = new ArrayList<>(); for (SaleOutVO vo : saleOutVOS) { // 检查组织是否为电缆组织 - if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { - result.add(vo); +// if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { +// result.add(vo); +// } + try { + String targetCode = "C034"; + String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); + if (code != null && code.equals(targetCode)) { + result.add(vo); + } + } catch (BusinessException e) { + ExceptionUtils.wrappBusinessException("查询组织时发生错误"); } } return result; 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 7aa785e..55d19c7 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 @@ -17,6 +17,7 @@ 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.StockOrgVO; import nc.vo.pub.BusinessException; import nc.vo.pubapp.pattern.exception.ExceptionUtils; import nc.vo.pubapp.pattern.pub.SqlBuilder; @@ -231,12 +232,21 @@ public class SalesDeliveryOrderRuleMES implements IRule { /** * 检查并筛选需要同步的单据 */ - private List checkAndFilterBills(SaleOutVO[] saleOutVOS) throws BusinessException { + private List checkAndFilterBills(SaleOutVO[] saleOutVOS) { List result = new ArrayList<>(); for (SaleOutVO vo : saleOutVOS) { // 检查组织是否为电缆组织 - if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { - result.add(vo); +// if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { +// result.add(vo); +// } + try { + String targetCode = "C034"; + String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); + if (code != null && code.equals(targetCode)) { + result.add(vo); + } + } catch (BusinessException e) { + ExceptionUtils.wrappBusinessException("查询组织时发生错误"); } } return result; 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 e563db5..3fa1511 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 @@ -16,6 +16,7 @@ import nc.vo.bd.supplier.SupplierVO; import nc.vo.ic.m4r.entity.InvCountBillVO; import nc.vo.ic.m4r.entity.InvCountBodyVO; import nc.vo.ic.m4r.entity.InvCountHeaderVO; +import nc.vo.org.StockOrgVO; import nc.vo.pub.BusinessException; import nc.vo.pub.lang.UFDate; import nc.vo.pub.lang.UFDouble; @@ -73,12 +74,21 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { /** * 检查并筛选需要同步的单据 */ - private List checkAndFilterBills(InvCountBillVO[] invCountBillVOS) throws BusinessException { + private List checkAndFilterBills(InvCountBillVO[] invCountBillVOS) { List result = new ArrayList<>(); for (InvCountBillVO vo : invCountBillVOS) { // 检查组织是否为电缆组织 - if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { - result.add(vo); +// if (vo.getHead() != null && "0001A110000000000677".equals(vo.getHead().getPk_org())) { +// result.add(vo); +// } + try { + String targetCode = "C034"; + String code = transferCodeByPk(StockOrgVO.getDefaultTableName(), StockOrgVO.CODE, StockOrgVO.PK_STOCKORG, vo.getParentVO().getPk_org()); + if (code != null && code.equals(targetCode)) { + result.add(vo); + } + } catch (BusinessException e) { + ExceptionUtils.wrappBusinessException("查询组织时发生错误"); } } return result; 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 632c318..3c8ada3 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 @@ -13,6 +13,7 @@ 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.org.SalesOrgVO; import nc.vo.pub.BusinessException; import nc.vo.pub.billtype.BilltypeVO; import nc.vo.pub.lang.UFDate; @@ -214,8 +215,17 @@ public class AfterApprovingSynchronizeRuleMES implements IRule { List result = new ArrayList<>(); for (SaleOrderVO vo : saleOutVOS) { // 检查组织是否为电缆组织 - if (vo.getParentVO().getPk_org() != null && "0001A110000000000677".equals(vo.getParentVO().getPk_org())) { - result.add(vo); +// if (vo.getParentVO().getPk_org() != null && "0001A110000000000677".equals(vo.getParentVO().getPk_org())) { +// result.add(vo); +// } + try { + String targetCode = "C034"; + String code = transferCodeByPk(SalesOrgVO.getDefaultTableName(), SalesOrgVO.CODE, SalesOrgVO.PK_SALESORG, vo.getParentVO().getPk_org()); + if (code != null && code.equals(targetCode)) { + result.add(vo); + } + } catch (BusinessException e) { + ExceptionUtils.wrappBusinessException("查询组织时出现问题"); } } return result;