From 5cd596595b79a6b8edefd421c8eb2663e09e18f9 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Tue, 22 Apr 2025 18:08:42 +0800
Subject: [PATCH] =?UTF-8?q?refactor(lets):=20=E9=87=8D=E6=9E=84=E5=85=AC?=
=?UTF-8?q?=E5=8F=B8=E4=BB=A3=E7=A0=81=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 将硬编码的公司代码过滤条件替换为从数据库动态获取的过滤条件- 优化了多个插件中的公司代码过滤逻辑，提高了代码复用性和可维护性
- 新增 queryBdDefDocByListPk 方法用于获取过滤条件
---
.../plugin/lets/entity/BdDefdocEntity.xml | 1 +
.../outsourc/ConsignmachiningCinfurmIn.java | 7 +++--
.../plugin/outsourc/ConsignmachiningIn.java | 7 +++--
.../outsourc/ConsignmachiningInReturn.java | 30 +++++++++++++++++++
.../plugin/purchase/ProxyPurchaseReturn.java | 6 ++--
.../purchase/ProxyPurchaseWarehousOrder.java | 6 ++--
.../ProxyPurchaseWarehousWarehouse.java | 6 ++--
.../sales/PassiveWarehouseReceiptToB.java | 9 ++++--
.../sales/PassiveWarehouseReceiptToC.java | 9 ++++--
.../sales/SoSaleOutPluginInitializerToB.java | 9 ++++--
.../sales/SoSaleOutPluginInitializerToC.java | 9 ++++--
.../SoSaleReturnPluginInitializerToB.java | 9 ++++--
.../SoSaleReturnPluginInitializerToC.java | 9 ++++--
.../plugin/lets/util/QueryU8CEntityUtil.java | 21 ++++++++++---
.../ConsignmachiningCinfurmInTest.java | 10 +++++--
.../RefundOnlyPluginInitializerToBTest.java | 20 +++++++++++++
.../SoSaleOutPluginInitializerToCTest.java | 6 ++--
.../frame/ttxofs/basics/ApiDtoCacheMap.java | 4 +--
18 files changed, 139 insertions(+), 39 deletions(-)
create mode 100644 buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToBTest.java
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml
index 34810698..47375fab 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdDefdocEntity.xml
@@ -16,6 +16,7 @@
+
doccode
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java
index 3cc5cd9e..6bcf0de0 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmIn.java
@@ -237,12 +237,13 @@ public class ConsignmachiningCinfurmIn extends PluginBaseEntity {
printOfsDocCode(ofsWareConfirmaDataArrayList, startTime, endTime);
if (ofsWareConfirmaDataArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
ofsWareConfirmaDataArrayList.removeIf(new Predicate() {
@Override
public boolean test(OFSReceiptConfirmSearchResponse.Order headerDetailsDto) {
OFSReceiptConfirmSearchResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -298,12 +299,14 @@ public class ConsignmachiningCinfurmIn extends PluginBaseEntity {
logger.info("数据返回行数：{}", ofsWareConfirmaDataArrayList.size());
if (ofsWareConfirmaDataArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
+
ofsWareConfirmaDataArrayList.removeIf(new Predicate() {
@Override
public boolean test(OFSReceiptConfirmSearchResponse.Order headerDetailsDto) {
OFSReceiptConfirmSearchResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
index a971acfc..8799488c 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningIn.java
@@ -240,12 +240,14 @@ public class ConsignmachiningIn extends PluginBaseEntity {
printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime);
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
+
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -298,12 +300,13 @@ public class ConsignmachiningIn extends PluginBaseEntity {
ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search");
logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
index b0446c10..6a0ad0b7 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningInReturn.java
@@ -19,6 +19,7 @@ import com.hzya.frame.plugin.lets.u8cdto.*;
import com.hzya.frame.plugin.lets.util.*;
import com.hzya.frame.split.SplitListByCountUtil;
import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity;
+import com.hzya.frame.ttxofs.dto.ofsReceiptConfirmSearch.OFSReceiptConfirmSearchResponse;
import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderData;
import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderDetails;
import com.hzya.frame.ttxofs.dto.ofspoorder.OfsPoOrderHeader;
@@ -38,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
@@ -237,6 +239,20 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime);
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
+
+ returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
+ @Override
+ public boolean test(HeaderDetailsDto headerDetailsDto) {
+ HeaderDto header = headerDetailsDto.getHeader();
+ if (header != null && header.getCompanyCode() != null) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
+ return true;
+ }
+ }
+ return false;
+ }
+ });
getSet(returnGoodHeaderDetailsDataDtoArrayList);
} else {
logger.info("没有查询到任何数据！不需要发起同步逻辑！！");
@@ -282,6 +298,20 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search");
logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
+
+ returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
+ @Override
+ public boolean test(HeaderDetailsDto headerDetailsDto) {
+ HeaderDto header = headerDetailsDto.getHeader();
+ if (header != null && header.getCompanyCode() != null) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
+ return true;
+ }
+ }
+ return false;
+ }
+ });
getSet(returnGoodHeaderDetailsDataDtoArrayList);
} else {
logger.info("没有查询到任何数据！不需要发起同步逻辑！！");
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
index c3fc0928..7871838e 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
@@ -230,12 +230,13 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime);
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -287,12 +288,13 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.shipment.search");
logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java
index 54ffd971..9c7f6639 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousOrder.java
@@ -227,12 +227,13 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity {
printOfsDocCode(allOfsPoOrderList, startTime, endTime);
if (allOfsPoOrderList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
allOfsPoOrderList.removeIf(new Predicate() {
@Override
public boolean test(OfsPoOrderData headerDetailsDto) {
OfsPoOrderHeader header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -284,12 +285,13 @@ public class ProxyPurchaseWarehousOrder extends PluginBaseEntity {
ofsStandardUtil.queryOfsPoOrder(queryOfsSoSaleOutVo, allOfsPoOrderList, 1L);
logger.info("数据返回行数：{}", allOfsPoOrderList.size());
if (allOfsPoOrderList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
allOfsPoOrderList.removeIf(new Predicate() {
@Override
public boolean test(OfsPoOrderData headerDetailsDto) {
OfsPoOrderHeader header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
index 977142bc..7f519df7 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
@@ -235,12 +235,13 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity {
printOfsDocCode(ofsWareConfirmaDataArrayList, startTime, endTime);
if (ofsWareConfirmaDataArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
ofsWareConfirmaDataArrayList.removeIf(new Predicate() {
@Override
public boolean test(OFSReceiptConfirmSearchResponse.Order headerDetailsDto) {
OFSReceiptConfirmSearchResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -294,12 +295,13 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity {
printOfsDocCode(ofsWareConfirmaDataArrayList, code);
if (ofsWareConfirmaDataArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
ofsWareConfirmaDataArrayList.removeIf(new Predicate() {
@Override
public boolean test(OFSReceiptConfirmSearchResponse.Order headerDetailsDto) {
OFSReceiptConfirmSearchResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToB.java
index 3b77ad89..e45e3516 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToB.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToB.java
@@ -281,12 +281,13 @@ public class PassiveWarehouseReceiptToB extends PluginBaseEntity {
printOfsDocCode(passiveStorageResponseDataDtoArrayList, startTime, endTime, "无源入库单");
if (passiveStorageResponseDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
passiveStorageResponseDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(PassiveStorageResponse.Data headerDetailsDto) {
PassiveStorageResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -335,12 +336,13 @@ public class PassiveWarehouseReceiptToB extends PluginBaseEntity {
printOfsDocCode(passiveStorageResponseDataDtoArrayList, startTime, endTime, "无源入库单退货");
if (passiveStorageResponseDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
passiveStorageResponseDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(PassiveStorageResponse.Data headerDetailsDto) {
PassiveStorageResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -387,12 +389,13 @@ public class PassiveWarehouseReceiptToB extends PluginBaseEntity {
if (passiveStorageResponseDataList.size() > 0) {
if (sceneType.equals("stock")) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
passiveStorageResponseDataList.removeIf(new Predicate() {
@Override
public boolean test(PassiveStorageResponse.Data headerDetailsDto) {
PassiveStorageResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
index 9ba54ac2..81f2c608 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/PassiveWarehouseReceiptToC.java
@@ -262,12 +262,13 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
logger.info("TOC退货数据返回行数：{}", passiveStorageResponseDataList.size());
if (passiveStorageResponseDataList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
passiveStorageResponseDataList.removeIf(new Predicate() {
@Override
public boolean test(PassiveStorageResponse.Data headerDetailsDto) {
PassiveStorageResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -312,13 +313,14 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
logger.info("数据返回行数：{}", passiveStorageResponseDataList.size());
if (passiveStorageResponseDataList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
passiveStorageResponseDataList.removeIf(new Predicate() {
@Override
public boolean test(PassiveStorageResponse.Data headerDetailsDto) {
PassiveStorageResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
//过滤掉业务上不需要的公司
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -366,13 +368,14 @@ public class PassiveWarehouseReceiptToC extends PluginBaseEntity {
logger.info("数据返回行数：{}", passiveStorageResponseDataList.size());
if (passiveStorageResponseDataList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
passiveStorageResponseDataList.removeIf(new Predicate() {
@Override
public boolean test(PassiveStorageResponse.Data headerDetailsDto) {
PassiveStorageResponse.Header header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
//过滤掉不需要的公司
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
index 24f8ebcb..2aa06465 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
@@ -287,12 +287,13 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
printOfsDocCode(headerDetailsDtoList, startTime, endTime, "出库");
if (headerDetailsDtoList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
headerDetailsDtoList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -347,12 +348,13 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
printOfsDocCode(headerDetailsDtoList, startTime, endTime, "确认收入");
if (headerDetailsDtoList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
headerDetailsDtoList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -401,12 +403,13 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
logger.info("根据单据号查询：数据返回行数：{}", headerDetailsDtoList.size());
splicingPrintingOrderNumber(headerDetailsDtoList, sceneType, null, null, code);
if (headerDetailsDtoList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
headerDetailsDtoList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
index bcd09c3a..daacc136 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
@@ -277,12 +277,13 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
}
//执行主逻辑,并且过滤掉不需要的公司
if (headerDetailsDtoList != null && headerDetailsDtoList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
headerDetailsDtoList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -391,12 +392,13 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
logger.info("数据返回行数：{}", headerDetailsDtoList.size());
if (headerDetailsDtoList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
headerDetailsDtoList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -480,12 +482,13 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
logger.info("TOC数据返回行数：{}", headerDetailsDtoList.size());
if (headerDetailsDtoList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
headerDetailsDtoList.removeIf(new Predicate() {
@Override
public boolean test(HeaderDetailsDto headerDetailsDto) {
HeaderDto header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java
index b7db5721..cf9c11a7 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java
@@ -280,12 +280,13 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime, "入库");
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -342,12 +343,13 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
printOfsDocCode(returnGoodHeaderDetailsDataDtoArrayList, startTime, endTime, "确认收入");
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -400,12 +402,13 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
splicingPrintingOrderNumber(returnGoodHeaderDetailsDataDtoArrayList, sceneType, null, null, code);
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
if (sceneType.equals("stock")) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
index 0968ef87..7f6ff2be 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
@@ -257,12 +257,13 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
}
logger.info("TOC退货数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
}
@@ -310,12 +311,13 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoList, 1L, "ofs.receipt.search");
logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoList.size());
if (returnGoodHeaderDetailsDataDtoList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
//2025 年 3 月 20 日 18:25:25 改为生成红字应收单，不过滤先退款后退款的场景
@@ -390,13 +392,14 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
}
logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size());
if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) {
+ String filter_company = queryU8CEntityUtil.queryBdDefDocByListPk();
returnGoodHeaderDetailsDataDtoArrayList.removeIf(new Predicate() {
@Override
public boolean test(StockinOrderSearchResponse.StockinOrder headerDetailsDto) {
StockinOrderSearchResponse.StockinOrder.StockinH header = headerDetailsDto.getHeader();
if (header != null && header.getCompanyCode() != null) {
//过滤掉不需要的公司
- if (ProfilesActiveConstant.FILTER_COMPANY.contains(header.getCompanyCode().trim())) {
+ if (filter_company.contains(header.getCompanyCode().trim())) {
return true;
}
//过滤掉入库日期为空的单据
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java
index 69fb2799..114c2d89 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java
@@ -8,10 +8,7 @@ import com.hzya.frame.plugin.lets.entity.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -721,4 +718,20 @@ public class QueryU8CEntityUtil {
}
return bdBusitypeEntityList.get(0);
}
+
+ /**
+ * 根据自定义项列表pk查询自定义项
+ */
+ public String queryBdDefDocByListPk() {
+ BdDefdocEntity bdDefdocEntity1 = new BdDefdocEntity();
+ bdDefdocEntity1.setPkDefdoclist("0001A1100000000Y6WS6");
+ bdDefdocEntity1.setDataSourceCode(ProfilesActiveConstant.LETS_DATE_SOURCE);
+ List defdocEntityList = iBdDefdocDao.query(bdDefdocEntity1);
+ if (defdocEntityList.size() == 0) {
+ return "";
+ } else {
+ return defdocEntityList.stream().map(BdDefdocEntity::getDoccode).filter(Objects::nonNull) // 过滤空值
+ .collect(Collectors.joining(","));
+ }
+ }
}
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmInTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmInTest.java
index 5724ad19..732597c7 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmInTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/outsourc/ConsignmachiningCinfurmInTest.java
@@ -30,8 +30,14 @@ public class ConsignmachiningCinfurmInTest {
// consignmachiningCinfurmIn.startImplementByTime("2024-01-02 00:00:00", "2024-01-02 23:59:59");
// String code = "LETS-RE2024111400002771-confirm";
- String code = "LETS-RE2024112900000538-confirm";
- consignmachiningCinfurmIn.startImplementByCode(code);
+// String code = "LETS-RE2024112900000538-confirm";
+// consignmachiningCinfurmIn.startImplementByCode(code);
+
+ if ("HZYX,YD,NMNS,YX,KS,YNS,HJ".contains("121212")) {
+ System.out.println("存在");
+ } else {
+ System.out.println("不存在");
+ }
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToBTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToBTest.java
new file mode 100644
index 00000000..66071548
--- /dev/null
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToBTest.java
@@ -0,0 +1,20 @@
+package com.hzya.frame.plugin.lets.plugin.sales;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * @Author：liuyang
+ * @Package：com.hzya.frame.plugin.lets.plugin.sales
+ * @Project：kangarooDataCenterV3
+ * @name：RefundOnlyPluginInitializerToBTest
+ * @Date：2025/4/22 17:26
+ * @Filename：RefundOnlyPluginInitializerToBTest
+ */
+public class RefundOnlyPluginInitializerToBTest {
+
+ @Test
+ public void start() {
+ }
+}
\ No newline at end of file
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
index bb7f8c56..5263e5b1 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
@@ -96,8 +96,8 @@ class SoSaleOutPluginInitializerToCTest {
// soSaleOutPluginInitializerToC.splitDateAndPush(computingTime, "tran");
- String s = "LETS-SH2025032200027982";
- soSaleOutPluginInitializerToC.startImplementStockByCode(s, "stock");
+// String s = "LETS-SH2025032200027982";
+// soSaleOutPluginInitializerToC.startImplementStockByCode(s, "stock");
// soSaleOutPluginInitializerToC.startImplementStockByTime("2024-09-24 16:35:43","2024-09-24 16:35:45");
@@ -111,7 +111,7 @@ class SoSaleOutPluginInitializerToCTest {
// soSaleOutPluginInitializerToC.startImplementStockByCode(s, "tran");
try {
-// soSaleOutPluginInitializerToC.startImplementStockByTime("2025-02-18 11:54:18", "2025-02-18 11:54:18", "0");
+ soSaleOutPluginInitializerToC.startImplementStockByTime("2025-02-18 11:54:18", "2025-02-18 11:54:18", "0");
// String code = "LETS-SH2024052100015139";
// soSaleOutPluginInitializerToC.startImplementStockByCode(code, "tran");
diff --git a/service/src/main/java/com/hzya/frame/ttxofs/basics/ApiDtoCacheMap.java b/service/src/main/java/com/hzya/frame/ttxofs/basics/ApiDtoCacheMap.java
index 68f0b68f..84242351 100644
--- a/service/src/main/java/com/hzya/frame/ttxofs/basics/ApiDtoCacheMap.java
+++ b/service/src/main/java/com/hzya/frame/ttxofs/basics/ApiDtoCacheMap.java
@@ -35,8 +35,8 @@ public class ApiDtoCacheMap {
public static final Map apiDtoCacheMap = new HashMap();
static {
- apiDtoCacheMap.put("ofs.salesOrder.search", new SaleOrderMessageDto());
- apiDtoCacheMap.put("ofs.shipment.search", new SaleOutReturnMessageDto());
+ apiDtoCacheMap.put("ofs.salesOrder.search", new SaleOrderMessageDto());//销售订单
+ apiDtoCacheMap.put("ofs.shipment.search", new SaleOutReturnMessageDto());//销售出库单查询
apiDtoCacheMap.put("ofs.receipt.search", new StockinOrderSearchResponse());//入库单查询
apiDtoCacheMap.put("ofs.transferOrder.search", new OFSTranseferOrderSearchResponse());//调拨订单