From 40450630b3e76a7c8ae8625cb89c8f10499e3ff2 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期五, 21 六月 2024 10:03:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
index ed366a2..61975ba 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -138,7 +138,7 @@
try {
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
if (!Cools.isEmpty(basCrnp)) {
- if (basCrnp.getWrkNo() == 0 && basCrnp.getCrnSts() != 3) {
+ if (basCrnp.getWrkNo() != 0 || basCrnp.getWrkNoTwo()!=0 || basCrnp.getCrnSts() != 3) {
continue;
}
if (basCrnp.getCrnStatusOne() == 20 && basCrnp.getCrnStatusTwo() == 20) {//鍫嗗灈鏈哄伐浣�1鏈夌墿寰呬綔涓� 宸ヤ綅2鏈夌墿寰呬綔涓�
@@ -176,4 +176,35 @@
}
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void executeThree() {
+ for (Integer crnNo : SplitTwin_CRN_NO) {
+ try {
+ BasCrnp basCrnp = basCrnpService.selectById(crnNo);
+ if (!Cools.isEmpty(basCrnp)) {
+ if (basCrnp.getWrkNo() != 0 || basCrnp.getWrkNoTwo()!=0 || basCrnp.getCrnSts() != 3) {
+ continue;
+ }
+ if (basCrnp.getCrnStatusOne() == 0 && basCrnp.getCrnStatusTwo() == 20) {//鍫嗗灈鏈哄伐浣�1绌洪棽 宸ヤ綅2鏈夌墿寰呬綔涓�
+ List<WrkMastSplitTwin> wrkMastSplitTwinListTwo = wrkMastSplitTwinService.getWrkMastSplitTwinNoComplete(crnNo, 2, null, null, 4);
+ if (wrkMastSplitTwinListTwo.isEmpty()){
+ continue;
+ }
+ if (wrkMastSplitTwinListTwo.size() > 1){
+ log.error("鍓嶅悗鍙屽伐浣嶆媶鍒嗗爢鍨涙満鎵ц浣滀笟鐢熸垚,鍫嗗灈鏈哄彿={},寮傚父淇℃伅={},宸ヤ綅鍙�={}",crnNo,"涓嶅瓨鍦ㄦ垨鑰呭瓨鍦ㄥ绗斿彲鎵ц浣滀笟锛岃缁存姢鎵ц浣滀笟锛侊紒锛�",2);
+ continue;
+ }
+ WrkMastSplitTwin wrkMastSplitTwinTwo = wrkMastSplitTwinListTwo.get(0);
+ if (wrkMastSplitTwinTwo.getWrkType()!=1 || wrkMastSplitTwinTwo.getWrkSts()!=2){//宸ヤ綔绫诲瀷 0: 鏈煡 1: 鍙� 2: 鏀� 3: 鍙栨斁 4: 瀹屾垚 //宸ヤ綔鐘舵�� 0: 鍒濆 1: 绛夊緟鍙栬揣瀹屾垚 2: 鍙栬揣瀹屾垚寰呬綔涓� 3: 绛夊緟鏀捐揣瀹屾垚 4: 瀹屾垚
+ continue;
+ }
+ wrkMastSplitTwinInItHandler.start(wrkMastSplitTwinTwo);
+ }
+ }
+ } catch (Exception e) {
+ log.error("鍓嶅悗鍙屽伐浣嶆媶鍒嗗爢鍨涙満鎵ц浣滀笟鐢熸垚澶辫触锛屽爢鍨涙満鍙�={}锛屽紓甯稿師鍥�={}", crnNo, e.getMessage());
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1