From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-job/src/main/java/com/aps/job/task/RyTask.java |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 103 insertions(+), 5 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 89b40a4..c73f228 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,9 +1,10 @@
 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;
 
@@ -26,6 +27,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)
     {
@@ -60,6 +76,21 @@
     }
 
     /**
+     * 姣忔棩鍚屾閽ｉ噾宸ュ崟鏁版嵁
+     * */
+    public void  syncPlateOrderData ()
+    {
+
+        iApsWorkOrderJobService.syncPlateOrderData();
+    }
+    /**
+     * 姣忔棩鍚屾姘旀煖绠¤矾鏁版嵁
+     * */
+    public void  syncGasPipingData ()
+    {
+        iApsWorkOrderJobService.syncGasPipingData();
+    }
+    /**
      * 姣忔棩鍚屾鎵�鏈夊伐鍗曟暟鎹�
      * */
     public void syncWorkOrderData()
@@ -75,20 +106,87 @@
         param.setDocState(Arrays.asList(0,1,2,4));
         param.setBeginDate(yesterdayMidnight.format(formatter));
         param.setEndDate(today.format(formatter));
-        param.setPageSize(1000);
+        param.setPageSize(500);
         while (continueFlag){
             param.setPageIndex(currentPage);
             continueFlag= iApsWorkOrderJobService.batchSaveByPager(param);
             currentPage++;
         }
     }
+    /**
+     * 姣忔棩鍚屾鎵�鏈夊伐鍗曟暟鎹�
+     * */
+    public void syncAllWorkOrder()
+    {
 
+        boolean continueFlag = true;
+        Integer currentPage = 1;
+        ApsWorkOrderJobParam param=new ApsWorkOrderJobParam();
+        param.setPageIndex(currentPage);
+        param.setDocState(Arrays.asList(0,1,2,4));
+        param.setPageSize(500);
+        while (continueFlag){
+            param.setPageIndex(currentPage);
+            continueFlag= iApsWorkOrderJobService.batchSaveByPager(param);
+            currentPage++;
+        }
+    }
     /**
      * 灏嗗伐鍗曞伐搴忔暟鎹悓姝ュ埌涓氬姟琛ㄤ腑
      */
     public void insertIntoApsProcessRoute()
     {
-        iApsWorkOrderProcessService.deleteApsProcessRoute();
-        iApsWorkOrderProcessService.insertIntoApsProcessRoute();
+        iApsWorkOrderProcessService.syncProcessRouteData();
     }
+
+    /**
+     * 鍚屾闆朵欢銆侀挘閲戙�佹皵鏌滅璺殑宸ュ崟鏁版嵁鍒颁笟鍔¤〃涓�佸悓姝ュ伐搴忔暟鎹埌宸ヨ壓璺嚎琛ㄤ腑
+     */
+    public void syncAllTypeOrder()
+    {
+        iApsWorkOrderJobService.syncPartOrderData();
+        iApsWorkOrderJobService.syncPlateOrderData();
+        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)
+    {
+        apsMaterialStorageManagementJobService.syncApsMaterialStorageDataJob(pageIndex, pageSize, orgCode, itemCodeList);
+    }
+
+    /**
+     * 鍚屾鍏ㄩ噺宸ヨ壓璺嚎鏁版嵁瀹氭椂浠诲姟
+     */
+    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);
+    }
+
+
 }

--
Gitblit v1.9.3