From 142dedfcf17712637376baa60be607b923dd249b Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 20 五月 2025 10:47:54 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 c73f228..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();
@@ -166,7 +171,10 @@
*/
public void syncApsMaterialStorageDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
{
- apsMaterialStorageManagementJobService.syncApsMaterialStorageDataJob(pageIndex, pageSize, orgCode, itemCodeList);
+ boolean res = apsMaterialStorageManagementJobService.syncApsMaterialStorageDataJob(pageIndex, pageSize, orgCode, itemCodeList);
+ if(res){
+ remoteCoreService.setStorageDataToRedis(SecurityConstants.INNER);
+ }
}
/**
@@ -188,5 +196,11 @@
apsMaterialManagementJobService.syncApsMaterialDataJob(pageIndex, pageSize, orgCode, itemCodeList);
}
+ /**
+ * 鍒锋柊閽ｉ噾瀛愬崟鏁版嵁鍒癛edis
+ */
+ public void setPlateSubPlansToRedis(){
+ remoteCoreService.setPlateSubPlansToRedis(SecurityConstants.INNER);
+ }
}
--
Gitblit v1.9.3