From 62d50105d04b5130b776e34e75b57a7bdc276495 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Thu, 24 Apr 2025 10:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A1=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=AC=E5=8F=B8=E8=BF=87=E6=BB=A4=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/adjust/AdjustInPluginInitializer.java | 6 +++++- .../plugin/adjust/AdjustInZZPluginInitializer.java | 6 +++++- .../plugin/adjust/AdjustOutPluginInitializer.java | 6 +++++- .../sales/RefundOnlyPluginInitializerToB.java | 13 +++++++++++-- .../sales/RefundOnlyPluginInitializerToC.java | 13 +++++++++++-- .../transfer/TransferInPluginInitializer.java | 6 +++++- .../transfer/TransferOutPluginInitializer.java | 6 +++++- 7 files changed, 47 insertions(+), 9 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java index 0bf33f16..1b3765cb 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java @@ -245,7 +245,11 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { for (StockinOrderSearchResponse.StockinOrder stockinOrder : stockinOrders) { StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// continue; +// } + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + if(filterCompanyStr.contains(header.getCompanyCode().trim())){ continue; } String rootAppPk = header.getCode(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java index d06c1f76..91a4d4fc 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java @@ -248,7 +248,11 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { StockinOrderSearchResponse.StockinOrder.StockinH header = stockinOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if("NMNS".equals(header.getCompanyCode())||"YNS".equals(header.getCompanyCode())||"HJ".equals(header.getCompanyCode())){ +// if("NMNS".equals(header.getCompanyCode())||"YNS".equals(header.getCompanyCode())||"HJ".equals(header.getCompanyCode())){ +// continue; +// } + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + if(filterCompanyStr.contains(header.getCompanyCode().trim())){ continue; } //cdispatcherid--收发类别,U8_RECEIPT_TYPE 0106 组装入库 diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java index 723b0c03..260d5b01 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java @@ -245,7 +245,11 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { for (StockoutOrderSearchResponse.StockoutOrder stockoutOrder : stockoutOrders) { StockoutOrderSearchResponse.StockoutOrder.StockoutH header = stockoutOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if("NMNS".equals(header.getCompanyCode())||"YNS".equals(header.getCompanyCode())||"HJ".equals(header.getCompanyCode())){ +// if("NMNS".equals(header.getCompanyCode())||"YNS".equals(header.getCompanyCode())||"HJ".equals(header.getCompanyCode())){ +// continue; +// } + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + if(filterCompanyStr.contains(header.getCompanyCode().trim())){ continue; } String rootAppPk = header.getCode(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java index a2c22a6b..e94961b4 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java @@ -331,7 +331,11 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { RerturnGoodsOrderSearchHeader header = returnGoodsOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// continue; +// } + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + if(filterCompanyStr.contains(header.getCompanyCode().trim())){ continue; } @@ -750,7 +754,12 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { //zyx19 ofs单号 String ofsOrdersCode = vv.stream().map(RerturnGoodsOrderSearchDetails::getReturnOrderCode).filter(Objects::nonNull).collect(Collectors.joining(",")); - parentvo.setZyx19(ofsOrdersCode); + if(ofsOrdersCode.length()>=1000){ + parentvo.setZyx19(ofsOrdersCode.substring(0,1000)); + }else { + parentvo.setZyx19(ofsOrdersCode); + } +// parentvo.setZyx19(ofsOrdersCode); //推送 arapDjzbVO.setParentvo(parentvo); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java index a0cab969..b684a669 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java @@ -333,7 +333,11 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { RerturnGoodsOrderSearchHeader header = returnGoodsOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// continue; +// } + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + if(filterCompanyStr.contains(header.getCompanyCode().trim())){ continue; } @@ -749,7 +753,12 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { //zyx19 ofs单号 String ofsOrdersCode = vv.stream().map(RerturnGoodsOrderSearchDetails::getReturnOrderCode).filter(Objects::nonNull).collect(Collectors.joining(",")); - parentvo.setZyx19(ofsOrdersCode); + if(ofsOrdersCode.length()>=1000){ + parentvo.setZyx19(ofsOrdersCode.substring(0,1000)); + }else { + parentvo.setZyx19(ofsOrdersCode); + } +// parentvo.setZyx19(ofsOrdersCode); //推送 arapDjzbVO.setParentvo(parentvo); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java index bbdc8e92..9babc162 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java @@ -268,7 +268,11 @@ public class TransferInPluginInitializer extends PluginBaseEntity { for (OFSReceiptConfirmSearchResponse.Order order : orders) { OFSReceiptConfirmSearchResponse.Header header = order.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if (FILTER_CORP_LIST.contains(header.getCompanyCode())) { +// if (FILTER_CORP_LIST.contains(header.getCompanyCode())) { +// continue; +// } + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + if(filterCompanyStr.contains(header.getCompanyCode().trim())){ continue; } String rootAppPk = header.getCode() + "_" + header.getId(); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java index cba015ba..fe2f9364 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java @@ -252,7 +252,11 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { for (StockoutOrderSearchResponse.StockoutOrder stockoutOrder : transferOutOrder) { StockoutOrderSearchResponse.StockoutOrder.StockoutH header = stockoutOrder.getHeader(); //过滤"NMNS"\"YNS"\"HJ" - if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// if ("NMNS".equals(header.getCompanyCode()) || "YNS".equals(header.getCompanyCode()) || "HJ".equals(header.getCompanyCode())) { +// continue; +// } + String filterCompanyStr = queryU8CEntityUtil.queryBdDefDocByListPk(); + if(filterCompanyStr.contains(header.getCompanyCode().trim())){ continue; } String rootAppPk = header.getCode();