From 1e18edd0a428c65522891c8d112ba2cd4d3a8e26 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Thu, 15 May 2025 16:18:29 +0800
Subject: [PATCH] =?UTF-8?q?refactor(buildpackage):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E5=92=8C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ConsignmachiningCinfurmIn 和 ConsignmachiningInReturn 中添加了对关键字段的验证- 在 SoSaleOutPluginInitializerToC 中添加了日志记录和调试信息
- 优化了测试用例的执行逻辑
- 删除了不必要的注释和调试代码
---
 .../plugin/lets/entity/BdDefdocEntity.xml     |  1 +
 .../plugin/lets/entity/BdTaxitemsEntity.xml   |  1 +
 .../outsourc/ConsignmachiningCinfurmIn.java   | 22 ++++++++++++++++++-
 .../outsourc/ConsignmachiningInReturn.java    | 18 ++++++++++++++-
 .../sales/SoSaleOutPluginInitializerToC.java  |  6 ++++-
 .../ConsignmachiningCinfurmInTest.java        | 14 ++++++------
 .../SoSaleOutPluginInitializerToCTest.java    |  4 ++--
 .../SoSaleReturnPluginInitializerToCTest.java |  6 ++---
 .../lets/util/DeleteU8cDataUtilTest.java      |  4 +++-
 .../lets/util/DeleteU8cDataUtilTest2.java     |  2 ++
 10 files changed, 62 insertions(+), 16 deletions(-)

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 47375fab..db3470da 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
@@ -32,6 +32,7 @@
         ,shortname 
         ,ts 
      </sql>
+
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-BdDefdocEntity-result" parameterType = "com.hzya.frame.plugin.lets.entity.BdDefdocEntity">
     select
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml
index 2c50dc57..9735c71f 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdTaxitemsEntity.xml
@@ -178,6 +178,7 @@
             and sts='Y'
         </trim>
     </update>
+
     <!--通过主键删除-->
     <delete id="entity_delete">
         delete
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 6bcf0de0..88929259 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
@@ -510,6 +510,9 @@ public class ConsignmachiningCinfurmIn extends PluginBaseEntity {
 
                                 ConsignmachiningInBodyDto consignmachiningInBodyDto = new ConsignmachiningInBodyDto();
                                 consignmachiningInBodyDto.setCinventoryid(bdInvmandocEntity.getPkInvmandoc());//存货主键
+//                                if ("40756".equals(new BigDecimal(receivedQty).stripTrailingZeros().toPlainString())) {
+//                                    System.out.println("111");
+//                                }
                                 consignmachiningInBodyDto.setNinnum(new BigDecimal(receivedQty).stripTrailingZeros().toPlainString());//实收数量
                                 consignmachiningInBodyDto.setNprice(noriginalcurprice.stripTrailingZeros().toPlainString());//单价（含税单价）
                                 consignmachiningInBodyDto.setCsourcetype("61");//来源单据类型
@@ -531,6 +534,20 @@ public class ConsignmachiningCinfurmIn extends PluginBaseEntity {
                                 consignmachiningInBodyDtoArrayList.add(consignmachiningInBodyDto);
                             }
 
+                            //加个小验证,如果Cfirstbillbid、Cfirstbillhid、Cfirsttype其中之一没有传，则抛出异常
+                            for (int j = 0; j < consignmachiningInBodyDtoArrayList.size(); j++) {
+                                ConsignmachiningInBodyDto consignmachiningInBodyDto = consignmachiningInBodyDtoArrayList.get(j);
+                                if (consignmachiningInBodyDto.getCfirstbillbid() == null || "".equals(consignmachiningInBodyDto.getCfirstbillbid())) {
+                                    Assert.state(false, "cfirstbillbid不能为空！");
+                                }
+                                if (consignmachiningInBodyDto.getCfirstbillhid() == null || "".equals(consignmachiningInBodyDto.getCfirstbillhid())) {
+                                    Assert.state(false, "cfirstbillhid不能为空！");
+                                }
+                                if (consignmachiningInBodyDto.getCfirsttype() == null || "".equals(consignmachiningInBodyDto.getCfirsttype())) {
+                                    Assert.state(false, "cfirsttype不能为空！");
+                                }
+                            }
+
                             List<ConsignmachiningInHeadBodyDto> consignmachiningInHeadBodyDtoArrayList = new ArrayList<>();
                             ConsignmachiningInHeadBodyDto consignmachiningInHeadBodyDto = new ConsignmachiningInHeadBodyDto();
                             consignmachiningInHeadBodyDto.setParentvo(poOrderParentDto);
@@ -542,7 +559,10 @@ public class ConsignmachiningCinfurmIn extends PluginBaseEntity {
                             //2024年8月26日 14:41:46 委外入库核销方式传不了！已经提交总部，2024年8月30日 14:05:25 已经解决，和妮姐确认不用填写
                             //2024年8月26日 14:42:19 无法超委外订单数量入库！已经提交给总部
                             //2024年9月3日 18:28:24 退货不会出现超订单出库的情况
-                            IcGeneralHResultDto icGeneralHResultDto = sendU8cConsignmachiningIn(JSON.toJSONString(stringStringMap));
+                            //2025-05-15 15:51:04 记录日志信息
+                            String interfaceInputParameters = JSON.toJSONString(stringStringMap);
+                            logger.info("O采购入库确认单(委外加工类型)生成U8C委外入库单(关联原单) 接口入参：{}", interfaceInputParameters);
+                            IcGeneralHResultDto icGeneralHResultDto = sendU8cConsignmachiningIn(interfaceInputParameters);
 
                             String cgeneralhid = null;
                             String vbillcode = null;
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 6a0ad0b7..dd90d3e7 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
@@ -520,6 +520,20 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
                                 consignmachiningInBodyDtoArrayList.add(consignmachiningInBodyDto);
                             }
 
+                            //加个小验证,如果Cfirstbillbid、Cfirstbillhid、Cfirsttype其中之一没有传，则抛出异常
+                            for (int j = 0; j < consignmachiningInBodyDtoArrayList.size(); j++) {
+                                ConsignmachiningInBodyDto consignmachiningInBodyDto = consignmachiningInBodyDtoArrayList.get(j);
+                                if (consignmachiningInBodyDto.getCfirstbillbid() == null || "".equals(consignmachiningInBodyDto.getCfirstbillbid())) {
+                                    Assert.state(false, "cfirstbillbid不能为空！");
+                                }
+                                if (consignmachiningInBodyDto.getCfirstbillhid() == null || "".equals(consignmachiningInBodyDto.getCfirstbillhid())) {
+                                    Assert.state(false, "cfirstbillhid不能为空！");
+                                }
+                                if (consignmachiningInBodyDto.getCfirsttype() == null || "".equals(consignmachiningInBodyDto.getCfirsttype())) {
+                                    Assert.state(false, "cfirsttype不能为空！");
+                                }
+                            }
+
                             List<ConsignmachiningInHeadBodyDto> consignmachiningInHeadBodyDtoArrayList = new ArrayList<>();
                             ConsignmachiningInHeadBodyDto consignmachiningInHeadBodyDto = new ConsignmachiningInHeadBodyDto();
                             consignmachiningInHeadBodyDto.setParentvo(poOrderParentDto);
@@ -531,7 +545,9 @@ public class ConsignmachiningInReturn extends PluginBaseEntity {
                             //2024年8月26日 14:41:46 委外入库核销方式传不了！已经提交总部，2024年8月30日 14:05:25 已经解决，和妮姐确认不用填写
                             //2024年8月26日 14:42:19 无法超委外订单数量入库！已经提交给总部
                             //2024年9月3日 18:28:24 退货不会出现超订单出库的情况
-                            IcGeneralHResultDto icGeneralHResultDto = sendU8cConsignmachiningIn(JSON.toJSONString(stringStringMap));
+                            String interfaceInputParameters = JSON.toJSONString(stringStringMap);
+                            logger.info("OFS采退出库单生成U8C红字委外入库单(关联原委外订单) 接口入参：{}", interfaceInputParameters);
+                            IcGeneralHResultDto icGeneralHResultDto = sendU8cConsignmachiningIn(interfaceInputParameters);
 
                             String cgeneralhid = null;
                             String vbillcode = null;
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 daacc136..b975c5c9 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
@@ -2180,9 +2180,13 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
                 String sceneType = "tran";
                 List<SonDetailsDto> sonDetailsDtoList = queryBasicArchivesStock(headerDetailsDtos, sceneType);
                 //分组汇总：红蓝
-                Map<String, List<SonDetailsDto>> summaryDimensionMap = groupSummaryStock(sonDetailsDtoList, null);
+//                String dimension = "1001&tm-intoyou&intoyou-tmdg&6973391732529&SALES&002";
+                String dimension = null;
+                Map<String, List<SonDetailsDto>> summaryDimensionMap = groupSummaryStock(sonDetailsDtoList, dimension);
                 //分组汇总：蓝
 //                Map<String, List<SonDetailsDto>> summaryDimensionMap2 = groupSummaryStock(sonDetailsDtoList, "2");
+//                String names = summaryDimensionMap.get(dimension).stream().map(SonDetailsDto::getId).collect(Collectors.joining(","));
+//                System.out.println(names);
 
                 //TOC业务流程-TOC冲回发出商品
                 BdBusitypeEntity bdBusitypeEntity = u8cOperationFlowV2();
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 732597c7..0e74e326 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,14 +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-RE2025040700001976-confirm";
+            consignmachiningCinfurmIn.startImplementByCode(code);
 
-            if ("HZYX,YD,NMNS,YX,KS,YNS,HJ".contains("121212")) {
-                System.out.println("存在");
-            } else {
-                System.out.println("不存在");
-            }
+//            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/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java
index 5263e5b1..a9136b85 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
@@ -99,7 +99,7 @@ class SoSaleOutPluginInitializerToCTest {
 //        String s = "LETS-SH2025032200027982";
 //        soSaleOutPluginInitializerToC.startImplementStockByCode(s, "stock");
 
-//        soSaleOutPluginInitializerToC.startImplementStockByTime("2024-09-24 16:35:43","2024-09-24 16:35:45");
+        soSaleOutPluginInitializerToC.startImplementTranByTime("2025-05-08 00:00:00", "2025-05-08 23:59:59", "2");
 
 //        List<com.hzya.frame.ttxofs.dto.ofssalesordersearch.HeaderDetailsDto> headerDetailsDtoArrayList = new ArrayList<>();
 //        QueryOfsSoSaleOutVo queryOfsSoSaleOutVo = new QueryOfsSoSaleOutVo();
@@ -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/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 ede326db..08c071d3 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
@@ -43,8 +43,8 @@ public class SoSaleReturnPluginInitializerToCTest {
 //        soSaleReturnPluginInitializerToC.startImplement(null, null);
         try {
             //带优惠金额场景
-            String code = "LETS-RE2025042100000200";
-            soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock");
+//            String code = "LETS-RE2025042100000200";
+//            soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock");
 
             //无优惠金额场景
 //            String code = "LETS-RE2025031900000002";
@@ -65,7 +65,7 @@ public class SoSaleReturnPluginInitializerToCTest {
 //        soSaleReturnPluginInitializerToC.startImplementStockByTime(startAndEndVos.get(0).getStart_time(), startAndEndVos.get(0).getEnd_time());
 
         try {
-//            soSaleReturnPluginInitializerToC.startImplementByTradeTime("2024-12-23 23:05:34", "2024-12-23 23:05:34", "2");
+            soSaleReturnPluginInitializerToC.startImplementByTradeTime("2025-04-28 00:00:00", "2025-04-28 23:59:59", "2");
 
 //            soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025010900002384", "tran");
 
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java
index 03bfb5dd..aeb589ce 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java
@@ -57,11 +57,13 @@ public class DeleteU8cDataUtilTest {
 //            deleteU8cDataUtil.cancelSignatureIcGeneralHV2("0001A110000000001TH6");
             //删除销售出库单 *
 //            deleteU8cDataUtil.deleteIcGeneralH();
-            deleteU8cDataUtil.deleteIcGeneralHV2();
+//            deleteU8cDataUtil.deleteIcGeneralHV2();
 
             //取消签字销售订单 *
 //            deleteU8cDataUtil.cancelSignatureSoSale();
 //            deleteU8cDataUtil.cancelSignatureSoSaleV2();
+
+            deleteU8cDataUtil.cancelSignatureSoSaleReadExcel();
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java
index c1532ed4..65045185 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest2.java
@@ -58,6 +58,8 @@ public class DeleteU8cDataUtilTest2 {
             //取消签字销售订单
 //            deleteU8cDataUtil.cancelSignatureSoSale();
 
+            //批量取消签字，并删除销售出库单
+            deleteU8cDataUtil.cancelSignatureSoSaleReadExcelV2();
         } catch (Exception e) {
             e.printStackTrace();
         }