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 | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 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 efecb7a..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;
@@ -40,6 +41,9 @@
@Autowired
private IApsStandardProcessRouteHeaderJobService apsStandardProcessRouteHeaderJobService;
+ @Autowired
+ private IApsMaterialManagementJobService apsMaterialManagementJobService;
+
public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
{
System.out.println(StringUtils.format("鎵ц澶氬弬鏂规硶锛� 瀛楃涓茬被鍨媨}锛屽竷灏旂被鍨媨}锛岄暱鏁村瀷{}锛屾诞鐐瑰瀷{}锛屾暣褰}", s, b, l, d, i));
@@ -58,9 +62,12 @@
/**
* 鍚屾宸ュ崟宸ュ簭鏁版嵁
*/
+ @Transactional(rollbackFor = Exception.class)
public void syncWorkOrderProcessData(String status, Integer pageSize)
{
+ iApsWorkOrderProcessService.deleteApsWorkOrderProcess();
iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
+ iApsWorkOrderProcessService.syncProcessRouteData();
}
/**
@@ -116,6 +123,7 @@
public void syncAllWorkOrder()
{
+ iApsWorkOrderJobService.deleteAllWorkOrderJob();
boolean continueFlag = true;
Integer currentPage = 1;
ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
@@ -163,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);
+ }
}
/**
@@ -172,10 +183,24 @@
public void syncProcessRouteJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
{
boolean res = apsStandardProcessRouteHeaderJobService.syncProcessRouteDataJob(pageIndex, pageSize, orgCode, itemCodeList);
-// if(res){
-// remoteCoreService.setBomDataToRedis(SecurityConstants.INNER);
-// }
+ if(res){
+ remoteCoreService.setProcessRouteDataToRedis(SecurityConstants.INNER);
+ }
}
+ /**
+ * 鍚屾鍏ㄩ噺鐗╂枡鏁版嵁瀹氭椂浠诲姟
+ */
+ public void syncApsMaterialDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
+ {
+ apsMaterialManagementJobService.syncApsMaterialDataJob(pageIndex, pageSize, orgCode, itemCodeList);
+ }
+
+ /**
+ * 鍒锋柊閽ｉ噾瀛愬崟鏁版嵁鍒癛edis
+ */
+ public void setPlateSubPlansToRedis(){
+ remoteCoreService.setPlateSubPlansToRedis(SecurityConstants.INNER);
+ }
}
--
Gitblit v1.9.3