From 63840f7e5a339a3ad0be1a5922d03001effc976b Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:39:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(sales):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 TOB 和 TOC 退货查询中添加或移除状态参数- 更新测试用例中的输入数据 - 优化代码结构，提高可读性和可维护性 --- .../lets/plugin/sales/SoSaleReturnPluginInitializerToB.java | 3 +++ .../lets/plugin/sales/SoSaleReturnPluginInitializerToC.java | 2 +- .../lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java | 2 +- .../plugin/sales/SoSaleReturnPluginInitializerToBTest.java | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) 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 cdf31985..ef470298 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 @@ -262,6 +262,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setClosedAt_start(startTime); queryOfsSoSaleOutVo.setClosedAt_end(endTime); queryOfsSoSaleOutVo.setClientCode("LETS"); + queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(50L); queryOfsSoSaleOutVo.setStoreCode(tobShop); @@ -309,6 +310,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setClientCode("LETS"); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(50L); +// queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setStoreCode(tobShop); queryOfsSoSaleOutVo.setInternalInstructionType("RETURN"); queryOfsSoSaleOutVo.setRefundStatus("900"); @@ -356,6 +358,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity { queryOfsSoSaleOutVo.setStoreCode(tobShop); queryOfsSoSaleOutVo.setCode(code); queryOfsSoSaleOutVo.setInternalInstructionType("RETURN"); +// queryOfsSoSaleOutVo.setStatus(900L); ofsStandardUtil.queryOfsReturnGoods(queryOfsSoSaleOutVo, returnGoodHeaderDetailsDataDtoArrayList, 1L, "ofs.receipt.search"); logger.info("数据返回行数：{}", returnGoodHeaderDetailsDataDtoArrayList.size()); if (returnGoodHeaderDetailsDataDtoArrayList.size() > 0) { 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 e6ae84ee..416ce811 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 @@ -262,7 +262,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { List returnGoodHeaderDetailsDataDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); - queryOfsSoSaleOutVo.setStatus(900L); +// queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(50L); queryOfsSoSaleOutVo.setStoreCode(tocShop); diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java index e1168f9c..e4f49bdf 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToBTest.java @@ -88,7 +88,7 @@ public class SoSaleOutPluginInitializerToBTest { // soSaleOutPluginInitializerToB.startImplementByStockTime("2024-10-31 14:48:41", "2024-10-31 14:48:41"); - soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024110500018124", "stock"); + soSaleOutPluginInitializerToB.startImplementByCode("LETS-SH2024110500037199", "stock"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java index 5d5962c7..1ef33798 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToBTest.java @@ -35,9 +35,9 @@ public class SoSaleReturnPluginInitializerToBTest { //测试TOB退货-确认收入 // soSaleReturnPluginInitializerToB.startImplementByTradeTime("2024-08-30 15:54:41", "2024-08-30 15:54:43"); - soSaleReturnPluginInitializerToB.startImplementByCode("LETS-RE2024102500000029", "tran"); +// soSaleReturnPluginInitializerToB.startImplementByCode("LETS-RE2022112800000053", "stock"); -// soSaleReturnPluginInitializerToB.startImplementByStockTime("2024-09-24 16:52:49", "2024-09-24 16:52:52"); + soSaleReturnPluginInitializerToB.startImplementByStockTime("2024-11-04 00:00:00", "2024-11-04 23:59:59"); } catch (Exception e) { e.printStackTrace(); } From d7d6bc7ce065618dbeb7fb2ca18a2be703f42a52 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 8 Nov 2024 11:44:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(report):=20=E4=B8=BA=20TOB=20=E5=92=8C?= =?UTF-8?q?=20TOC=20=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=20DTO=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 TobofsSaleoutDetailedDto 和 TocofsSaleoutDetailedDto 中添加 businessDate 和 successfulTradeDate 字段- 在 TocofsSaleoutDetailedEntity.xml 中添加对应的数据库映射 - 新增字段用于表示库存出库完成时间和交易成功时间 --- .../frame/report/lets/dto/TobofsSaleoutDetailedDto.java | 8 +++++++- .../frame/report/lets/dto/TocofsSaleoutDetailedDto.java | 6 ++++++ .../report/lets/entity/TocofsSaleoutDetailedEntity.xml | 4 ++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java index d6810603..ac3695ef 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java @@ -47,6 +47,9 @@ public class TobofsSaleoutDetailedDto { private String businesstype; //库存 开始 + @ExcelProperty(value = "库存-O出库完成时间") + private String businessDate; + @ExcelProperty(value = "库存-推送状态") private String newstate; @@ -62,8 +65,11 @@ public class TobofsSaleoutDetailedDto { @ExcelProperty(value = "库存-U8C主键") private String newsystemprimary; //库存 结束 - + //TOB交易红 开始 + @ExcelProperty(value = "交易-O交易成功时间") + private String successfulTradeDate; + @ExcelProperty(value = "交易-推送状态") private String newstate4; diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java index 280c463d..80e6812b 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsSaleoutDetailedDto.java @@ -47,6 +47,9 @@ public class TocofsSaleoutDetailedDto { private String businesstype; //库存 开始 + @ExcelProperty(value = "库存-O出库完成时间") + private String businessDate; + @ExcelProperty(value = "库存-推送状态") private String newstate; @@ -64,6 +67,9 @@ public class TocofsSaleoutDetailedDto { //库存 结束 //交易红 开始 + @ExcelProperty(value = "交易-O交易成功时间") + private String successfulTradeDate; + @ExcelProperty(value = "交易红-推送状态") private String newstate2; diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml index 10fe75ff..0a9db093 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml @@ -438,6 +438,8 @@ + + @@ -462,6 +464,8 @@ + +