refactor(deletedata): 优化数据删除逻辑和查询效率

- 修改销售发票和销售出库单的相关方法调用
- 优化数据查询 SQL，增加排序条件- 调整数据处理批次大小
- 修正单据编号字段的使用

buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest.java

@@ -47,21 +47,21 @@ public class DeleteU8cDataUtilTest {
 
             //弃审销售发票 *
 //            deleteU8cDataUtil.abandonmentReviewSoSaleinvoice();
-            deleteU8cDataUtil.abandonmentReviewSoSaleinvoiceV2();
+//            deleteU8cDataUtil.abandonmentReviewSoSaleinvoiceV2();
             //删除销售发票 *
 //            deleteU8cDataUtil.deleteSoSaleinvoice();
-            deleteU8cDataUtil.deleteSoSaleinvoiceV2();
+//            deleteU8cDataUtil.deleteSoSaleinvoiceV2();
 
             //取消签字销售出库单 * TOC确认收入 注意⚠️
 //            deleteU8cDataUtil.cancelSignatureIcGeneralH("0001A110000000001TH6");
-            deleteU8cDataUtil.cancelSignatureIcGeneralHV2("0001A110000000001TH6");
+//            deleteU8cDataUtil.cancelSignatureIcGeneralHV2("0001A110000000001TH6");
             //删除销售出库单 *
 //            deleteU8cDataUtil.deleteIcGeneralH();
             deleteU8cDataUtil.deleteIcGeneralHV2();
 
             //取消签字销售订单 *
 //            deleteU8cDataUtil.cancelSignatureSoSale();
-            deleteU8cDataUtil.cancelSignatureSoSaleV2();
+//            deleteU8cDataUtil.cancelSignatureSoSaleV2();
         } catch (Exception e) {
             e.printStackTrace();
         }

buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java

@@ -27,17 +27,17 @@ public class DeleteU8cDataUtilTest3 {
     public void deleteSoSaleinvoice() {
         try {
             //弃审销售发票 * 已测试
-            deleteU8cDataUtil.abandonmentReviewSoSaleinvoiceV2();
+//            deleteU8cDataUtil.abandonmentReviewSoSaleinvoiceV2();
             //删除销售发票 * 已测试
-            deleteU8cDataUtil.deleteSoSaleinvoiceV2();
+//            deleteU8cDataUtil.deleteSoSaleinvoiceV2();
 
-            //取消签字销售出库单 * TOC确认收入 注意⚠️ 待测试
+            //取消签字销售出库单 * TOC确认收入 注意⚠️ 已测试
 //            deleteU8cDataUtil.cancelSignatureIcGeneralHV2("0001A110000000001TH6");
-            //删除销售出库单 * 待测试
+            //删除销售出库单 * 已测试
 //            deleteU8cDataUtil.deleteIcGeneralHV2();
 
-            //取消签字销售订单 * 待测试
+            //取消签字销售订单 *
-//            deleteU8cDataUtil.cancelSignatureSoSaleV2();
+            deleteU8cDataUtil.cancelSignatureSoSaleV2();
         } catch (Exception e) {
             e.printStackTrace();
         }

service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java

@@ -44,7 +44,7 @@ public class DeleteU8cDataUtil {
 
     private static final Object LOCK_OBJECT = new Object();
 
-    private static final Integer SPLIT_VAR = 3000;
+    private static final Integer SPLIT_VAR = 1000;
 
     public void deleteTargetU8cData() {
         Thread thread = new Thread(new Runnable() {
@@ -246,7 +246,7 @@ public class DeleteU8cDataUtil {
                     for (Map.Entry<String, List<DeleteU8cDataUtilEntity>> entry : stringListMap.entrySet()) {
                         String key = entry.getKey();
                         List<DeleteU8cDataUtilEntity> valueList = entry.getValue();
-                        List<String> vreceiptcodeList = valueList.stream().map(DeleteU8cDataUtilEntity::getVreceiptcode).collect(Collectors.toList());
+                        List<String> vbillcodeList = valueList.stream().map(DeleteU8cDataUtilEntity::getVbillcode).collect(Collectors.toList());
 
                         String[] split = key.split("@@@@");
 
@@ -268,7 +268,7 @@ public class DeleteU8cDataUtil {
                         objectMap2.put("corp", split[1]);
                         objectMap2.put("date_begin", split[0]);
                         objectMap2.put("date_end", split[0]);
-                        objectMap2.put("billcode", vreceiptcodeList);
+                        objectMap2.put("billcode", vbillcodeList);
 
                         Map<String, Object> objectMap3 = new HashMap<>();
                         objectMap3.put("deleteInfo", objectMap);
@@ -336,7 +336,7 @@ public class DeleteU8cDataUtil {
                     for (Map.Entry<String, List<DeleteU8cDataUtilEntity>> entry : stringListMap.entrySet()) {
                         String key = entry.getKey();
                         List<DeleteU8cDataUtilEntity> valueList = entry.getValue();
-                        List<String> vreceiptcodeList = valueList.stream().map(DeleteU8cDataUtilEntity::getVreceiptcode).collect(Collectors.toList());
+                        List<String> vbillcodeList = valueList.stream().map(DeleteU8cDataUtilEntity::getVbillcode).collect(Collectors.toList());
 
                         String[] split = key.split("@@@@");
 
@@ -358,7 +358,7 @@ public class DeleteU8cDataUtil {
                         objectMap2.put("corp", split[1]);
                         objectMap2.put("date_begin", split[0]);
                         objectMap2.put("date_end", split[0]);
-                        objectMap2.put("billcode", vreceiptcodeList);
+                        objectMap2.put("billcode", vbillcodeList);
 
                         Map<String, Object> objectMap3 = new HashMap<>();
                         objectMap3.put("unsignInfo", objectMap1);

service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml

@@ -105,6 +105,9 @@
                 AND a.fstatus = #{fstatus}
             </if>
             AND a.dr = 0
+        ORDER BY
+            a.DBILLDATE,
+            a.PK_CORP ASC
     </select>
 
     <!--查询已审核的应收单-->