From 5da04bc2d5a1c02af3cde063d21101202e10ea24 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 30 四月 2025 08:55:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
index 73a1076..2920438 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java
@@ -277,10 +277,9 @@
apsWorkOrderJob.setProcessStatus(status);
// 琛ユ煡涔嬪墠娌℃湁鏌ュ埌宸ュ簭鐨勫伐鍗�
if("2".equals(status)){
- int total = apsWorkOrderJobMapper.selectApsWorkOrderJobListDocNoNotNull(apsWorkOrderJob).size();
- int pages = total % pageSize == 0 ? total / pageSize : total / pageSize + 1;
- for (int i = 1; i <= pages; i++){
- PageHelper.startPage(i, pageSize);
+ String lastDocNos = "";
+ while (true){
+ PageHelper.startPage(1, pageSize);
List<ApsWorkOrderJob> pageList = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob);
if(!pageList.isEmpty()){
long startTime = System.currentTimeMillis();
@@ -289,6 +288,10 @@
docNos.add(apsWorkOrderJob1.getDocNo());
}
getWorkOrderProcessFromU9(docNos);
+ if(String.join(",", docNos).equals(lastDocNos)){
+ break;
+ }
+ lastDocNos = String.join(",", docNos);
long endTime = System.currentTimeMillis(); // 璁板綍缁撴潫鏃堕棿
long duration = endTime - startTime; // 璁＄畻杩愯鏃堕棿
System.out.println("杩愯鏃堕棿锛�"+ duration +"姣");
--
Gitblit v1.9.3