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 1be20fa0..7a82cec1 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 @@ -31,7 +31,7 @@ public class DeleteU8cDataUtilTest { //删除销售出库单 // deleteU8cDataUtil.deleteIcGeneralH(); //删除销售订单 - deleteU8cDataUtil.deleteSoSale(); +// deleteU8cDataUtil.deleteSoSale(); } 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 b957069a..8a82123c 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -33,16 +33,20 @@ public class DeleteU8cDataUtil { protected Logger logger = LogManager.getLogger(super.getClass()); + private static final Object LOCK_OBJECT = new Object(); + public void deleteTargetU8cData() { Thread thread = new Thread(new Runnable() { @Override public void run() { - //删除销售发票 - deleteSoSaleinvoice(); - //删除销售出库单 - deleteIcGeneralH(); - //删除销售订单 - deleteSoSale(); + synchronized (LOCK_OBJECT) { + //删除销售发票 +// deleteSoSaleinvoice(); + //删除销售出库单 +// deleteIcGeneralH(); + //删除销售订单 +// deleteSoSale(); + } } }, "删除U8C11月份TOC对应的销售发票、销售出库单、销售订单"); thread.start(); 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 f903b272..4346917b 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 @@ -80,7 +80,7 @@ so_sale a LEFT JOIN bd_corp b ON b.pk_corp = a.pk_corp WHERE - a.cbiztype IN ('0001A110000000001TH5', '0001A110000000001TH6') + a.cbiztype IN ( '0001A110000000001TH5', '0001A110000000001TH6' ) AND a.dbilldate >= '2024-11-01 00:00:00' AND a.dbilldate <= '2024-11-30 23:59:59' AND a.fstatus = 1