From 1ca59775d3d58ae0d9aefd8a42990bab2e8c198c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 10 三月 2022 13:57:36 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   64 +++++++++++++++++--------------
 src/main/java/com/zy/core/MainProcess.java                  |    4 +
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3d1ad57..88cd453 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -614,8 +614,8 @@
                     if (wrkMast.getWrkSts() == 2L) {
                         this.letCarBeReady(wrkMast, steNo);
                     }
-                    // 鍫嗗灈鏈哄皢璐ф斁鑷冲皬杞︿笂 3.灏忚溅寰呮惉 ===>> 7.鍚婅溅鍏ュ簱涓�
-                    if (wrkMast.getWrkSts() == 3L) {
+                    // 鍫嗗灈鏈哄皢璐ф斁鑷冲皬杞︿笂 3.灏忚溅寰呮惉 / 6.灏忚溅寰呭叆  ===>> 7.鍚婅溅鍏ュ簱涓�
+                    if (wrkMast.getWrkSts() == 3L || wrkMast.getWrkSts() == 6L) {
                         // 灏忚溅澶勪簬绌洪棽
                         SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, steNo);
                         SteProtocol steProtocol = steThread.getSteProtocol();
@@ -650,6 +650,11 @@
                     }
                 // 娌℃湁灏忚溅
                 } else {
+                    // 1.瀵绘壘鏈�杩戠殑灏忚溅
+
+                    // 2.璁╁皬杞︾瓑寰呮惉杩愬緟缁�
+
+                    // 3.鍫嗗灈鏈烘惉杩愬皬杞�
 
                 }
 
@@ -977,33 +982,6 @@
 
     }
 
-    /**
-     * 绌挎杞﹀叆搴�
-     */
-    public void carGenerateStore() {
-        for (SteSlave ste : slaveProperties.getSte()) {
-            // 鑾峰彇鍫嗗灈鏈轰俊鎭�
-            SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
-            SteProtocol steProtocol = steThread.getSteProtocol();
-            if (steProtocol == null) { continue; }
-            if (steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
-                // 鏌ヨ鏄惁鏈夊緟鍏ュ簱鐨勪换鍔�
-                WrkMast wrkMast = wrkMastMapper.selectPakInStep8(steProtocol.getSteNo().intValue());
-                if (wrkMast == null) { continue; }
-
-                // 淇敼宸ヤ綔妗g姸鎬� 8.灏忚溅鎼叆搴� => 9.鍏ュ簱瀹屾垚
-                Date now = new Date();
-                wrkMast.setWrkSts(9L);
-                wrkMast.setCrnStrTime(now);
-                wrkMast.setModiTime(now);
-                if (wrkMastMapper.updateById(wrkMast) == 0) {
-                    log.error("淇敼宸ヤ綔妗g姸鎬� 8.灏忚溅鎼叆搴� => 9.鍏ュ簱瀹屾垚 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
-                } else {
-                    steThread.setResetFlag(true);
-                }
-            }
-        }
-    }
 
     /**
      * 鍫嗗灈鏈洪拡瀵逛簬灏忚溅杩佺Щ宸ヤ綔鐨勫畬鎴�
@@ -1113,6 +1091,34 @@
     }
 
     /**
+     * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+     */
+    public void carGenerateStore() {
+        for (SteSlave ste : slaveProperties.getSte()) {
+            // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+            SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, ste.getId());
+            SteProtocol steProtocol = steThread.getSteProtocol();
+            if (steProtocol == null) { continue; }
+            if (steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
+                // 鏌ヨ鏄惁鏈夊緟鍏ュ簱鐨勪换鍔�
+                WrkMast wrkMast = wrkMastMapper.selectPakInStep8(steProtocol.getSteNo().intValue());
+                if (wrkMast == null) { continue; }
+
+                // 淇敼宸ヤ綔妗g姸鎬� 8.灏忚溅鎼叆搴� => 9.鍏ュ簱瀹屾垚
+                Date now = new Date();
+                wrkMast.setWrkSts(9L);
+                wrkMast.setCrnStrTime(now);
+                wrkMast.setModiTime(now);
+                if (wrkMastMapper.updateById(wrkMast) == 0) {
+                    log.error("淇敼宸ヤ綔妗g姸鎬� 8.灏忚溅鎼叆搴� => 9.鍏ュ簱瀹屾垚 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+                } else {
+                    steThread.setResetFlag(true);
+                }
+            }
+        }
+    }
+
+    /**
      * 鍫嗗灈鏈哄紓甯镐俊鎭褰�
      */
     @Async
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 8046709..4b24503 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -53,8 +53,10 @@
                     mainService.crnIoExecute();
                     // 鍫嗗灈鏈洪拡瀵逛簬灏忚溅杩佺Щ宸ヤ綔鐨勫畬鎴�
                     mainService.carMoveFinished();
-                    // 鍏ュ簱  ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+                    // 鍏ュ簱  ===>> 鎵ц鍫嗗灈鏈哄宸ヤ綔妗g殑瀹屾垚鎿嶄綔
                     mainService.storeFinished();
+                    // 鍏ュ簱 ===>> 鎵ц绌挎杞﹀宸ヤ綔妗g殑瀹屾垚鎿嶄綔
+                    mainService.carGenerateStore();
                     // 鍫嗗灈鏈哄紓甯镐俊鎭褰�
                     mainService.recCrnErr();
                     // 鍏ュ簱  ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱,鍙夎溅鍏ュ簱绔欐斁璐�

--
Gitblit v1.9.1