From ca6e546a02c7c168263ba057ea51369ba44eb3cc Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 06 八月 2024 11:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/DownGlassInfoService.java | 21 +++++++++++++++++++--
1 files changed, 19 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..54c0318 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.mes.downglassinfo.entity.DownGlassInfo;
+import com.mes.downglassinfo.entity.request.DownGlassInfoRequest;
import com.mes.downworkstation.entity.dto.DownGlassInfoDTO;
import java.util.List;
@@ -13,7 +14,7 @@
* @param flowCardId
* @return // 鏍规嵁娴佺▼鍗″彿鏌ヨ鏈�澶у簭鍙�
*/
- Integer getMaxSequenceByFlowCardId(String flowCardId);
+ Integer getMaxSequenceByFlowCardId(String flowCardId, int layer);
/**
* @param downGlassInfo 鎻掑叆涓嬬墖淇℃伅
@@ -25,5 +26,21 @@
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);
+
+ String setDownGlassInfoRequest(DownGlassInfoRequest request);
}
--
Gitblit v1.8.0