From fbb90c31d56348ec3fcc49af49c66b19992f58df Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 16 五月 2025 17:15:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
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 ed72422..5a7a1f2 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
@@ -7,6 +7,7 @@
import com.aps.system.api.RemoteCoreService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -61,9 +62,12 @@
/**
* 鍚屾宸ュ崟宸ュ簭鏁版嵁
*/
+ @Transactional(rollbackFor = Exception.class)
public void syncWorkOrderProcessData(String status, Integer pageSize)
{
+ iApsWorkOrderProcessService.deleteApsWorkOrderProcess();
iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
+ iApsWorkOrderProcessService.syncProcessRouteData();
}
/**
@@ -119,6 +123,7 @@
public void syncAllWorkOrder()
{
+ iApsWorkOrderJobService.deleteAllWorkOrderJob();
boolean continueFlag = true;
Integer currentPage = 1;
ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
--
Gitblit v1.9.3