From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +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 | 75 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 12 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 0b16f5d..c48844c 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
@@ -45,24 +45,39 @@
/**
* 鍚屾宸ュ崟宸ュ簭鏁版嵁
*/
- public void syncWorkOrderProcessData()
+ public void syncWorkOrderProcessData(String status, Integer pageSize)
{
- iApsWorkOrderProcessService.syncWorkOrderProcessData();
+ iApsWorkOrderProcessService.syncWorkOrderProcessData(status, pageSize);
}
/**
* 姣忔棩鍚屾闆朵欢宸ュ崟鏁版嵁
+ * */
+ public void syncPartOrderData ()
+ {
+
+ iApsWorkOrderJobService.syncPartOrderData();
+ }
+
+ /**
+ * 姣忔棩鍚屾閽ｉ噾宸ュ崟鏁版嵁
+ * */
+ public void syncPlateOrderData ()
+ {
+
+ iApsWorkOrderJobService.syncPlateOrderData();
+ }
+ /**
+ * 姣忔棩鍚屾姘旀煖绠¤矾鏁版嵁
+ * */
+ public void syncGasPipingData ()
+ {
+ iApsWorkOrderJobService.syncGasPipingData();
+ }
+ /**
+ * 姣忔棩鍚屾鎵�鏈夊伐鍗曟暟鎹�
* */
public void syncWorkOrderData()
- {
-
- iApsWorkOrderJobService.SyncWorkOrderByTime();
- }
-
- /**
- * 姣忔棩鍚屾闆朵欢宸ュ崟鏁版嵁
- * */
- public void syncPartOrderData()
{
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime today = LocalDateTime.now();
@@ -75,11 +90,47 @@
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.syncProcessRouteData();
+ }
+
+ /**
+ * 鍚屾闆朵欢銆侀挘閲戙�佹皵鏌滅璺殑宸ュ崟鏁版嵁鍒颁笟鍔¤〃涓�佸悓姝ュ伐搴忔暟鎹埌宸ヨ壓璺嚎琛ㄤ腑
+ */
+ public void syncAllTypeOrder()
+ {
+ iApsWorkOrderJobService.syncPartOrderData();
+ iApsWorkOrderJobService.syncPlateOrderData();
+ iApsWorkOrderJobService.syncGasPipingData();
+ iApsWorkOrderProcessService.syncProcessRouteData();
+ }
}
--
Gitblit v1.9.3