From b80d2584e5942f8b66aad7007472dec92be64769 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 十月 2022 15:07:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 2548b3d..b84be88 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1014,9 +1014,15 @@
                             SteThread steThread = queryIdleCar(wrkMast);
                             if (steThread != null) {
                                 // 娌℃湁鍏朵粬浠诲姟
-                                if (null == wrkMastMapper.selectPakout(slave.getId(), steNo)) {
-                                    // 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
-                                    this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
+                                WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), steNo);
+                                if (null != pakoutWrkMast) {
+                                    if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
+                                            && pakoutWrkMast.getWrkSts() == 17
+                                            && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
+                                    ) {
+                                        // 璁╁皬杞︾瓑寰呮惉杩愬緟缁�
+                                        this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
+                                    }
                                 }
                             }
                         }

--
Gitblit v1.9.1