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 094bfed4..03bfb5dd 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 @@ -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(); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java index 9c583ffa..8dd761fb 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/DeleteU8cDataUtilTest3.java +++ b/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(); } diff --git a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java index 2bc8978f..fffbba17 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/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> entry : stringListMap.entrySet()) { String key = entry.getKey(); List valueList = entry.getValue(); - List vreceiptcodeList = valueList.stream().map(DeleteU8cDataUtilEntity::getVreceiptcode).collect(Collectors.toList()); + List 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 objectMap3 = new HashMap<>(); objectMap3.put("deleteInfo", objectMap); @@ -336,7 +336,7 @@ public class DeleteU8cDataUtil { for (Map.Entry> entry : stringListMap.entrySet()) { String key = entry.getKey(); List valueList = entry.getValue(); - List vreceiptcodeList = valueList.stream().map(DeleteU8cDataUtilEntity::getVreceiptcode).collect(Collectors.toList()); + List 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 objectMap3 = new HashMap<>(); objectMap3.put("unsignInfo", objectMap1); diff --git a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml index 71373523..01044b2c 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml +++ b/service/src/main/java/com/hzya/frame/deletedata/entity/DeleteU8cDataUtilEntity.xml @@ -105,6 +105,9 @@ AND a.fstatus = #{fstatus} AND a.dr = 0 + ORDER BY + a.DBILLDATE, + a.PK_CORP ASC