From 2d593d9bc6e14fcd9daa4e0c4244aba54ae1257a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 22 九月 2022 16:04:29 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   36 ++++++++++++++++++++++++++++++++++++
 src/main/resources/mapper/WrkMastMapper.xml                 |    4 ++--
 2 files changed, 38 insertions(+), 2 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 7af8fc0..2489e65 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -869,6 +869,11 @@
                 if (steNo != null) {
                     // 灏忚溅琛岃蛋鍒板爢鍨涙満寰呮惉绉荤偣
                     if (wrkMast.getWrkSts() == 11L && wrkMast.getSteNo() == null) {
+                        // 鏍囪绉诲簱褰撳墠娴佺▼
+                        wrkMast.setMk("I");
+                        if (wrkMastMapper.updateById(wrkMast) == 0) {
+                            log.error("鏍囪绉诲簱褰撳墠娴佺▼ I 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+                        }
                         this.letCarBeWaiting(wrkMast, steNo, wrkMast.getLocNo());
                     }
                     // 鍫嗗灈鏈哄皢璐ф斁鑷冲皬杞︿笂 6.灏忚溅寰呭叆  ===>> 7.鍚婅溅鍏ュ簱涓�
@@ -1543,6 +1548,37 @@
                         } else {
                             log.error("淇敼宸ヤ綔妗g姸鎬� 16.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
                         }
+                    } else if (wrkMast.getWrkSts() == 4) {
+                        // 4.杩佸叆灏忚溅 ==> 6.灏忚溅寰呭叆
+                        wrkMast.setWrkSts(6L);
+                        Date now = new Date();
+                        wrkMast.setCrnEndTime(now);
+                        wrkMast.setModiTime(now);
+                        // 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
+                        if (wrkMastMapper.updateById(wrkMast) > 0) {
+                            // 鍫嗗灈鏈哄浣�
+                            crnThread.setResetFlag(true);
+                            // 绌挎杞﹂噸鏂板畾浣嶆帓鍒楀眰
+                            SteThread steThread = (SteThread) SlaveConnection.get(SlaveType.Ste, wrkMast.getSteNo());
+                            if (!steThread.confirmPos()) {
+                                log.error("{}鍙风┛姊溅閲嶆柊瀹氫綅澶辫触锛佷綔涓氬伐浣滄。浠诲姟鍙凤細{}", wrkMast.getSteNo(), wrkMast.getWrkNo());
+                            }
+                            // 绌挎杞﹀幓寰呮満浣�
+                            BasSte basSte = basSteService.selectById(wrkMast.getSteNo());
+                            SteCommand steCommand = new SteCommand();
+                            steCommand.setSteNo(wrkMast.getSteNo()); // 绌挎杞︾紪鍙�
+                            steCommand.setTaskNo(9999); // 宸ヤ綔鍙�
+                            steCommand.setTaskMode(SteTaskModeType.findWaiting(basSte.getRow())); // 浠诲姟妯″紡:  鍘昏繎鐐� 绛夊緟鍫嗗灈鏈哄弶鍙�
+//                        steCommand.setRow(Utils.getGroupRow(steProtocol.getRow().intValue()).shortValue());
+//                        steCommand.setBay(steProtocol.getBay());
+//                        steCommand.setLev(steProtocol.getLev());
+                            if (!MessageQueue.offer(SlaveType.Ste, wrkMast.getSteNo(), new Task(2, steCommand))) {
+                                log.error("绌挎杞﹀緟鏈轰綅鍛戒护涓嬪彂澶辫触锛岀┛姊溅鍙�={}锛屼换鍔℃暟鎹�={}", wrkMast.getSteNo(), JSON.toJSON(steCommand));
+                            }
+                        } else {
+                            log.error("淇敼宸ヤ綔妗g姸鎬� 4.杩佸叆灏忚溅 => 6.灏忚溅寰呭叆 澶辫触锛侊紒锛屽伐浣滃彿={}", wrkMast.getWrkNo());
+                        }
+                        // 鍏ュ簱 ===>> 杩佸嚭灏忚溅 瀹屾垚
                     } else if (wrkMast.getWrkSts() == 7){
                         // 鍒ゆ柇鏄惁闇�瑕佸皬杞﹀叆搴�
                         if (locMastService.isOutMost(wrkMast.getLocNo())) {
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index db50b46..903c633 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -98,7 +98,7 @@
     </select>
 
     <select id="selectCrnWaiting" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5,7,13)
+        select top 1 * from dbo.asr_wrk_mast where wrk_no=#{workNo} and wrk_sts in (4,5,7,13, 16)
     </select>
 
     <select id="selectCarWaiting" resultMap="BaseResultMap">
@@ -118,7 +118,7 @@
     </select>
 
     <select id="selectLocMove" resultMap="BaseResultMap">
-        select top 1 * from dbo.asr_wrk_mast where wrk_sts=11 and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
+        select top 1 * from dbo.asr_wrk_mast where wrk_sts in (3,6,11,12,15) and io_type=11 and crn_no=#{crnNo} order by io_time,wrk_no
     </select>
 
     <select id="selectLocMoving" resultMap="BaseResultMap">

--
Gitblit v1.9.1