From 1c960030d0a2d4ffe67b0683f3090da21222595b Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:13:07 +0800 Subject: [PATCH] =?UTF-8?q?test(sales):=20=E6=9B=B4=E6=96=B0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新测试用例，注释掉部分测试代码 - 优化代码格式，提高可读性 -调整部分缩进和换行 --- .../plugin/sales/SoSaleReturnPluginInitializerToC.java | 8 ++++++-- .../sales/SoSaleReturnPluginInitializerToCTest.java | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) 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 e46f31d0..a1baa4ad 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 @@ -1447,7 +1447,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { boolean oneSuccess = false; if (!"Y".equals(newstate4)) { - if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType) || ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType)) && !"0".equals(goodsRertunSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) { + if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType) + || ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType)) + && !"0".equals(goodsRertunSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) { //推送U8C红字销售订单，如果推送失败，抛出异常，那么就会外围的try catch捕获，代码不会往下执行 List saleorderRequestDtoList = new ArrayList<>(); saleorderRequestDtoList.add(saleorderRequestDto); @@ -1483,7 +1485,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { try { //2025年8月25日10:41:37 如果实入数量全部0，蓝字销售订单则不推送，存在部分数量为0，则过滤 if (!"Y".equals(def15) && oneSuccess && "2".equals(oldValue.get(0).getStorageTimeStamp())) { - if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType) || ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType)) && !"0".equals(goodsRertunSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) { + if ((ProfilesActiveConstant.PUSH_SCENE_TYPE_1.equals(pushScenarioType) + || ProfilesActiveConstant.PUSH_SCENE_TYPE_2.equals(pushScenarioType)) + && !"0".equals(goodsRertunSonDetailsDto.getGroupShipQty().stripTrailingZeros().toPlainString())) { if ("2".equals(oldValue.get(0).getStorageTimeStamp())) { SaleorderRequestDto saleorderRequestDto1 = transformRedSalesOrderToBlueSalesOrder(saleorderRequestDto, bdBusitypeEntity2); 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 d1c3ef04..7df04ba6 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 @@ -69,14 +69,14 @@ public class SoSaleReturnPluginInitializerToCTest { try { // soSaleReturnPluginInitializerToC.startImplementByTradeTime("2025-04-28 00:00:00", "2025-04-28 23:59:59", "0"); -// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072900002315", "stock"); + soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025081100002196", "stock"); //满足红字应收单 // soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072200001324", "tran"); //情况一 // soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072200000255", "tran"); //情况二 -// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072900002597", "tran"); +// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072800002968", "tran"); //情况三 // soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025080200002257", "tran"); @@ -104,7 +104,7 @@ public class SoSaleReturnPluginInitializerToCTest { // soSaleReturnPluginInitializerToC.u8cOperationFlow(); - soSaleReturnPluginInitializerToC.startImplementByTradeTime("2025-08-01 00:00:00","2025-08-01 23:59:59", "2"); +// soSaleReturnPluginInitializerToC.startImplementStockByTime("2025-08-19 00:00:00", "2025-08-19 23:59:59", "2"); } catch (Exception e) { e.printStackTrace(); }