From 2f67e791dfbb6b298728d716e1f499ebd8225533 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 6 Nov 2024 19:14:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sales):=20=E4=BC=98=E5=8C=96=20TOC=20?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=92=8C=E9=80=80=E8=B4=A7=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正了 SoSaleOutPluginInitializerToC 和 SoSaleReturnPluginInitializerToC 中的变量命名 - 更新了退货入库单总金额的校验提示信息 - 修改了测试用例中的出库单和退货单编号 --- .../lets/plugin/sales/SoSaleOutPluginInitializerToC.java | 8 ++++---- .../plugin/sales/SoSaleReturnPluginInitializerToC.java | 2 +- .../plugin/sales/SoSaleOutPluginInitializerToCTest.java | 2 +- .../sales/SoSaleReturnPluginInitializerToCTest.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) 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 5d831ca9..7cb785f2 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 @@ -228,7 +228,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { Assert.notNull(endTime, "查询条件，结束时间不能为空！"); // CalculateDateVo calculateDateVo = DateStrUtil.calculateCalculateEntireDayPeriod(dateStr); - String tobShop = shopTobOrToCUtil.getCommaShop("TOC"); + String tocShop = shopTobOrToCUtil.getCommaShop("TOC"); List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); @@ -241,7 +241,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); - queryOfsSoSaleOutVo.setStoreCode(tobShop); + queryOfsSoSaleOutVo.setStoreCode(tocShop); // queryOfsSoSaleOutVo.setCode("LETS-SH2024070500000003"); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("数据返回行数：{}", headerDetailsDtoList.size()); @@ -322,7 +322,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { Assert.notNull(code, "O出库单编码不能为空！code is null！"); Assert.notNull(sceneType, "场景类型不能为空！"); - String tobShop = shopTobOrToCUtil.getCommaShop("TOC"); + String tocShop = shopTobOrToCUtil.getCommaShop("TOC"); List headerDetailsDtoList = new ArrayList<>(); QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo(); queryOfsSoSaleOutVo.setClientCode("LETS"); @@ -330,7 +330,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { queryOfsSoSaleOutVo.setStatus(900L); queryOfsSoSaleOutVo.setPageNo(1L); queryOfsSoSaleOutVo.setPageSize(100L); - queryOfsSoSaleOutVo.setStoreCode(tobShop); + queryOfsSoSaleOutVo.setStoreCode(tocShop); queryOfsSoSaleOutVo.setCode(code); ofsStandardUtil.queryOfsSaleOrder(queryOfsSoSaleOutVo, headerDetailsDtoList, 1L, "ofs.shipment.search"); logger.info("数据返回行数：{}", headerDetailsDtoList.size()); 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 12b40714..8d20cf34 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 @@ -1508,7 +1508,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { } //实付金额/实发数量 - Assert.notNull(totalAmount, "退货入库单总金额不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); + Assert.notNull(totalAmount, "实退金额不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); Assert.notNull(goodsRertunSonDetailsDto.getReceivedQty(), "实收数量不能为空 明细行对象:{}", JSON.toJSONString(goodsRertunSonDetailsDto)); BigDecimal totalPayAmountBigDecimal = new BigDecimal(totalAmount); BigDecimal shipQtyBigDecimal = new BigDecimal(goodsRertunSonDetailsDto.getReceivedQty()); 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 3f69cb0b..867cefa6 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 @@ -121,7 +121,7 @@ class SoSaleOutPluginInitializerToCTest { try { // soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024091900002878", "stock"); - soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024102600009446", "stock"); + soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110400042153", "stock"); } catch (Exception e) { e.printStackTrace(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java index c8870d22..73ee6bd0 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java @@ -30,7 +30,7 @@ public class SoSaleReturnPluginInitializerToCTest { public void startImplement() { // soSaleReturnPluginInitializerToC.startImplement(null, null); try { - String code = "LETS-RE2024092400000148"; + String code = "LETS-SH2024110500018255"; soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock"); } catch (Exception e) { e.printStackTrace();