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 |   74 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 2 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 c48844c..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
@@ -1,11 +1,13 @@
 package com.aps.job.task;
 
+import com.aps.common.core.constant.SecurityConstants;
 import com.aps.common.core.utils.StringUtils;
 import com.aps.job.param.ApsWorkOrderJobParam;
-import com.aps.job.service.IApsWorkOrderJobService;
-import com.aps.job.service.IApsWorkOrderProcessService;
+import com.aps.job.service.*;
+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;
@@ -27,6 +29,21 @@
     @Autowired
     private IApsWorkOrderJobService iApsWorkOrderJobService;
 
+    @Autowired
+    private IApsBomHeaderJobService iApsBomHeaderJobService;
+
+    @Autowired
+    private RemoteCoreService remoteCoreService;
+
+    @Autowired
+    private IApsMaterialStorageManagementJobService apsMaterialStorageManagementJobService;
+
+    @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));
@@ -45,9 +62,12 @@
     /**
      * 鍚屾宸ュ崟宸ュ簭鏁版嵁
      */
+    @Transactional(rollbackFor = Exception.class)
     public void syncWorkOrderProcessData(String status, Integer pageSize)
     {
+        iApsWorkOrderProcessService.deleteApsWorkOrderProcess();
         iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
+        iApsWorkOrderProcessService.syncProcessRouteData();
     }
 
     /**
@@ -103,6 +123,7 @@
     public void syncAllWorkOrder()
     {
 
+        iApsWorkOrderJobService.deleteAllWorkOrderJob();
         boolean continueFlag = true;
         Integer currentPage = 1;
         ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
@@ -133,4 +154,53 @@
         iApsWorkOrderJobService.syncGasPipingData();
         iApsWorkOrderProcessService.syncProcessRouteData();
     }
+
+    /**
+     * 鍚屾鍏ㄩ噺BOM鏁版嵁瀹氭椂浠诲姟
+     */
+    public void syncBomDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
+    {
+        boolean res =  iApsBomHeaderJobService.syncBomDataJob(pageIndex, pageSize, orgCode, itemCodeList);
+        if(res){
+            remoteCoreService.setBomDataToRedis(SecurityConstants.INNER);
+        }
+    }
+
+    /**
+     * 鍚屾鍏ㄩ噺搴撳瓨鏁版嵁瀹氭椂浠诲姟
+     */
+    public void syncApsMaterialStorageDataJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
+    {
+        boolean res = apsMaterialStorageManagementJobService.syncApsMaterialStorageDataJob(pageIndex, pageSize, orgCode, itemCodeList);
+        if(res){
+            remoteCoreService.setStorageDataToRedis(SecurityConstants.INNER);
+        }
+    }
+
+    /**
+     * 鍚屾鍏ㄩ噺宸ヨ壓璺嚎鏁版嵁瀹氭椂浠诲姟
+     */
+    public void syncProcessRouteJob(Integer pageIndex, Integer pageSize, String orgCode, String itemCodeList)
+    {
+        boolean res =  apsStandardProcessRouteHeaderJobService.syncProcessRouteDataJob(pageIndex, pageSize, orgCode, itemCodeList);
+        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