From 57100e633358b6e3c4e020dc798ddbc22ff9b042 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 3 Jun 2025 13:55:34 +0800 Subject: [PATCH] =?UTF-8?q?actorref(service):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=92=8C=E6=80=A7=E8=83=BD=E4=BC=98=E5=8C=96-=20?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E5=8F=8D=E5=AE=A1=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E5=92=8C=E5=88=A0=E9=99=A4=E9=94=80?= =?UTF-8?q?=E5=94=AE=E5=8F=91=E7=A5=A8=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20-=20=E4=BF=AE=E6=94=B9=E7=BA=BF=E7=A8=8B=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C=E7=A7=BB=E9=99=A4=20CountD?= =?UTF-8?q?ownLatch=20=E7=9A=84=E4=BD=BF=E7=94=A8=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AE=A1=E6=A0=B8=E7=9A=84?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1=20-=20?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=89=B9=E6=AC=A1=E5=A4=A7=E5=B0=8F=EF=BC=8C=E4=BB=8E?= =?UTF-8?q?=20500=20=E6=9D=A1=E6=94=B9=E4=B8=BA=20100=20=E6=9D=A1=20-=20?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=20SQL=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=20csaleid=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../frame/deletedata/DeleteU8cDataUtil.java | 77 ++++++++++--------- .../entity/DeleteU8cDataUtilEntity.xml | 4 +- 2 files changed, 41 insertions(+), 40 deletions(-) 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 0d16af5a..bfb68424 100644 --- a/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java +++ b/service/src/main/java/com/hzya/frame/deletedata/DeleteU8cDataUtil.java @@ -72,53 +72,54 @@ public class DeleteU8cDataUtil { Thread thread000 = new Thread(new Runnable() { @Override public void run() { - Thread thread = new Thread(new Runnable() { - @Override - public void run() { - synchronized (LOCK_OBJECT) { - if (MARK == 0) { - MARK = 1; - //删除销售出库单 -// cancelSignatureSoSaleReadExcel20250528V2(); - //反审核销售订单 - cancelSignatureSoSaleReadExcel2505282140V2(); - } - } - latch.countDown(); - } - }, "反审核销售订单 2025-05-30"); - thread.start(); - - Thread thread2 = new Thread(new Runnable() { - @Override - public void run() { - synchronized (LOCK_OBJECT2) { - if (MARK2 == 0) { - MARK2 = 1; - //删除销售发票 - abandonmentReviewSoSaleinvoice2505282107(); - } - } - latch.countDown(); - } - }, "删除销售发票 2025-05-30"); - thread2.start(); +// Thread thread = new Thread(new Runnable() { +// @Override +// public void run() { +// synchronized (LOCK_OBJECT) { +// if (MARK == 0) { +// MARK = 1; +// //删除销售出库单 +//// cancelSignatureSoSaleReadExcel20250528V2(); +// //反审核销售订单 +//// cancelSignatureSoSaleReadExcel2505282140V2(); +// } +// } +// latch.countDown(); +// } +// }, "反审核销售订单 2025-05-30"); +// thread.start(); +// +// Thread thread2 = new Thread(new Runnable() { +// @Override +// public void run() { +// synchronized (LOCK_OBJECT2) { +// if (MARK2 == 0) { +// MARK2 = 1; +// //删除销售发票 +//// abandonmentReviewSoSaleinvoice2505282107(); +// } +// } +// latch.countDown(); +// } +// }, "删除销售发票 2025-05-30"); +// thread2.start(); try { //等待两个线程都完成 - latch.await(); +// latch.await(); //在两个线程都完成后执行反审核销售订单方法 // cancelSignatureSoSaleReadExcel2505282140V2(); //修复销售订单部门字段错误问题 - repairSoSaleDepartment(); +// repairSoSaleDepartment(); //销售订单审核 // salesOrderReviewV2(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new RuntimeException("等待线程完成时中断", e); + } catch (Exception e) { + e.printStackTrace(); +// Thread.currentThread().interrupt(); +// throw new RuntimeException("等待线程完成时中断", e); } } - }, "U8C单据逻辑处理：修复销售订单部门字段错误问题"); + }, "U8C单据逻辑处理：销售订单审核"); thread000.start(); } @@ -1420,7 +1421,7 @@ public class DeleteU8cDataUtil { //注意⚠️这里只能审核已经修复完毕的销售订单！并且处理自由状态 List deleteU8cDataUtilEntities = deleteU8cDataUtilDao.cancelSignatureSoSaleReadExcel20250528V3(); if (deleteU8cDataUtilEntities.size() > 0) { - List> lists = SplitListByCountUtil.splitListByCount(deleteU8cDataUtilEntities, 500); + List> lists = SplitListByCountUtil.splitListByCount(deleteU8cDataUtilEntities, 100); for (int i = 0; i < lists.size(); i++) { List deleteU8cDataUtilEntities1 = lists.get(i); String concatenatedIds = deleteU8cDataUtilEntities1.stream().map(DeleteU8cDataUtilEntity::getCsaleid).map(csaleid -> "'" + csaleid + "'").collect(Collectors.joining(",")); 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 8cf8a81e..d9ec94e9 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 @@ -311,7 +311,7 @@ AND a.cdeptid NOT IN ( SELECT pk_deptdoc FROM bd_deptdoc WHERE deptname = '业务部门' AND dr = 0 ) AND a.cdeptid IS NOT NULL and a.pk_corp != c.pk_corp - -- and a.csaleid = '1001A1100000000FBSGV' + -- and a.csaleid = '1015A11000000000SIO8' @@ -475,7 +475,7 @@ AND a.cdeptid IS NOT NULL AND a.pk_corp = c.pk_corp and a.fstatus in (1) - -- and a.csaleid = '1001A1100000000FC70H' + -- and a.csaleid = '1015A11000000000SIO8'