From 9b3f76e38ea10241625cee9ea6e9fa69e792d38b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 七月 2024 15:46:18 +0800
Subject: [PATCH] 下片任务:fixbug 解决被禁用情况下仍有玻璃走禁用的线路

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
index cea55e5..0830e6b 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java
@@ -13,7 +13,7 @@
      * @param flowCardId
      * @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
      */
-    Integer getMaxSequenceByFlowCardId(String flowCardId);
+    Integer getMaxSequenceByFlowCardId(String flowCardId, int layer);
 
     /**
      * @param downGlassInfo 鎻掑叆涓嬬墖淇℃伅
@@ -25,5 +25,19 @@
 
     Integer queryMaxSequence(String flowCardId, int layer);
 
-    List<DownGlassInfoDTO> queryWorkStationNotIn();
+    /**
+     * 鑾峰彇鏋跺瓙缁戝畾 娴佺▼鍗$殑鐜荤拑淇℃伅锛堝凡钀芥灦/鏈惤鏋讹級
+     *
+     * @param isDownload true/false
+     * @return
+     */
+    List<DownGlassInfoDTO> queryWorkStationIsIn(Boolean isDownload);
+
+    /**
+     * 鐢熸垚鍑虹墖浠诲姟
+     *
+     * @param glassId
+     * @return
+     */
+    boolean generateOutGlassTask(String glassId);
 }

--
Gitblit v1.8.0