From 2bdb234b82f18e09a1ab8fd9bd28b44fed9084be Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期一, 21 四月 2025 10:27:36 +0800
Subject: [PATCH] 【UPDATE】1.修改抓取工单工序定时任务增加可补查之前未查到工序的工单
---
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java | 2
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java | 61 ++++++++++++++++++++++--------
aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java | 4 +-
3 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
index 7f5646a..74873dc 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderProcessService.java
@@ -70,7 +70,7 @@
/**
* 鍚屾宸ュ崟宸ュ簭鏁版嵁
*/
- public void syncWorkOrderProcessData();
+ public void syncWorkOrderProcessData(String status, Integer pageSize);
/**
* 鎻掑叆宸ュ崟宸ュ簭鏁版嵁鍒颁笟鍔¤〃
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 39ea457..de015e2 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
@@ -185,8 +185,10 @@
apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
if (existsId != null) {
apsWorkOrderProcess.setId(existsId);
+ apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
updateList.add(apsWorkOrderProcess);
} else {
+ apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
addList.add(apsWorkOrderProcess);
}
if(!nowDocNo.equals(process.getString("DocNo"))){
@@ -235,26 +237,53 @@
}
@Override
- public void syncWorkOrderProcessData() {
+ public void syncWorkOrderProcessData(String status, Integer pageSize) {
try{
//鍒嗛〉鏌ヨ宸ュ崟
ApsWorkOrderJob apsWorkOrderJob = new ApsWorkOrderJob();
- apsWorkOrderJob.setProcessStatus("0");
- while (true){
- PageHelper.startPage(1, 100);
- List<ApsWorkOrderJob> pageList = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob);
- if(!pageList.isEmpty()){
- long startTime = System.currentTimeMillis();
- List<String> docNos = new ArrayList<>();
- for (ApsWorkOrderJob apsWorkOrderJob1 : pageList){
- docNos.add(apsWorkOrderJob1.getDocNo());
+ if(status==null){
+ status = "0";
+ }
+ if(pageSize==null){
+ pageSize = 100;
+ }
+ apsWorkOrderJob.setProcessStatus(status);
+ // 琛ユ煡涔嬪墠娌℃湁鏌ュ埌宸ュ簭鐨勫伐鍗�
+ if("2".equals(status)){
+ int total = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob).size();
+ int pages = total % pageSize == 0 ? total / pageSize : total / pageSize + 1;
+ for (int i = 1; i <= pages; i++){
+ PageHelper.startPage(i, pageSize);
+ List<ApsWorkOrderJob> pageList = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob);
+ if(!pageList.isEmpty()){
+ long startTime = System.currentTimeMillis();
+ List<String> docNos = new ArrayList<>();
+ for (ApsWorkOrderJob apsWorkOrderJob1 : pageList){
+ docNos.add(apsWorkOrderJob1.getDocNo());
+ }
+ getWorkOrderProcessFromU9(docNos);
+ long endTime = System.currentTimeMillis(); // 璁板綍缁撴潫鏃堕棿
+ long duration = endTime - startTime; // 璁＄畻杩愯鏃堕棿
+ System.out.println("杩愯鏃堕棿锛�"+ duration +"姣");
}
- getWorkOrderProcessFromU9(docNos);
- long endTime = System.currentTimeMillis(); // 璁板綍缁撴潫鏃堕棿
- long duration = endTime - startTime; // 璁＄畻杩愯鏃堕棿
- System.out.println("杩愯鏃堕棿锛�"+ duration +"姣");
- }else{
- break;
+ }
+ }else{
+ while (true){
+ PageHelper.startPage(1, pageSize);
+ List<ApsWorkOrderJob> pageList = apsWorkOrderJobMapper.selectApsWorkOrderJobList(apsWorkOrderJob);
+ if(!pageList.isEmpty()){
+ long startTime = System.currentTimeMillis();
+ List<String> docNos = new ArrayList<>();
+ for (ApsWorkOrderJob apsWorkOrderJob1 : pageList){
+ docNos.add(apsWorkOrderJob1.getDocNo());
+ }
+ getWorkOrderProcessFromU9(docNos);
+ long endTime = System.currentTimeMillis(); // 璁板綍缁撴潫鏃堕棿
+ long duration = endTime - startTime; // 璁＄畻杩愯鏃堕棿
+ System.out.println("杩愯鏃堕棿锛�"+ duration +"姣");
+ }else{
+ break;
+ }
}
}
}catch (Exception e){
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
index ca35630..89b40a4 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java
@@ -45,9 +45,9 @@
/**
* 鍚屾宸ュ崟宸ュ簭鏁版嵁
*/
- public void syncWorkOrderProcessData()
+ public void syncWorkOrderProcessData(String status, Integer pageSize)
{
- iApsWorkOrderProcessService.syncWorkOrderProcessData();
+ iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
}
/**
--
Gitblit v1.9.3