From 230c45d8e5d68fe7060aa135d5216ef24f0f7f79 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Mon, 25 Aug 2025 16:57:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(buildpackage):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -简化了推送场景类型的判断条件 - 增加了判断红字应收单的注释说明 - 调整了代码格式，提高了可读性 --- .../plugin/sales/SoSaleReturnPluginInitializerToC.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 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 109ee6e1..19b061c9 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,9 +1447,7 @@ 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); @@ -1485,9 +1483,7 @@ 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); @@ -4265,6 +4261,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity { /** * 判断红字应收单 + * true 存在非0的金额 + * false 全部金额为0 */ private boolean filterJfbbjeIncludingTax(List childrennArrayList) { // 处理空列表或null：视为"全部为0"，返回false