From 47dccb453160541c2fdb816b551e158ee67a5015 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 14 五月 2024 09:26:39 +0800
Subject: [PATCH] 卧式理片笼 优化进出片逻辑

---
 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
index 0f0b2a6..500a02a 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/CacheGlassTask.java
@@ -109,15 +109,15 @@
             log.info("2銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
             //鍔犵瀛愰噷闈㈡槸鍚︽湁鐜荤拑锛屾湁鍏堝嚭锛屾棤鐜荤拑鍏堣繘
             int count = edgStorageCageDetailsService.count(new LambdaQueryWrapper<EdgStorageCageDetails>().eq(EdgStorageCageDetails::getState, Const.GLASS_STATE_IN));
-            if ("0".equals(out08Glassstate) && "0".equals(out10Glassstate) && count < 9) {
-                inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
-            } else {
+            if (("1".equals(out08Glassstate) || "1".equals(out10Glassstate)) && count > 0) {
                 boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
                         Integer.parseInt(out10Glassstate), confirmationWrodAddress);
                 log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},澶辫触涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
                 if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
                     inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
                 }
+            } else {
+                inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
             }
         }
     }

--
Gitblit v1.8.0