actorref(service): 调整销售订单处理逻辑和性能优化- 注释掉反审核销售订单和删除销售发票的相关代码
- 修改线程处理逻辑,移除 CountDownLatch 的使用 - 优化销售订单审核的线程执行任务 - 调整销售订单处理批次大小,从 500 条改为 100 条 - 统一 SQL 查询条件中的 csaleid值
This commit is contained in:
parent
c7c763bc60
commit
57100e6333
|
@ -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<DeleteU8cDataUtilEntity> deleteU8cDataUtilEntities = deleteU8cDataUtilDao.cancelSignatureSoSaleReadExcel20250528V3();
|
||||
if (deleteU8cDataUtilEntities.size() > 0) {
|
||||
List<List<DeleteU8cDataUtilEntity>> lists = SplitListByCountUtil.splitListByCount(deleteU8cDataUtilEntities, 500);
|
||||
List<List<DeleteU8cDataUtilEntity>> lists = SplitListByCountUtil.splitListByCount(deleteU8cDataUtilEntities, 100);
|
||||
for (int i = 0; i < lists.size(); i++) {
|
||||
List<DeleteU8cDataUtilEntity> deleteU8cDataUtilEntities1 = lists.get(i);
|
||||
String concatenatedIds = deleteU8cDataUtilEntities1.stream().map(DeleteU8cDataUtilEntity::getCsaleid).map(csaleid -> "'" + csaleid + "'").collect(Collectors.joining(","));
|
||||
|
|
|
@ -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'
|
||||
</select>
|
||||
|
||||
<!--查询审批状态下的销售发票-->
|
||||
|
@ -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'
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
|
|
Loading…
Reference in New Issue