From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
index 5e8c697..3538593 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java
@@ -49,11 +49,11 @@
/**
* @param flowCardId
- * @param glassInfoCount
+ *
* @param workstationId
* @return 鏇存柊鏋跺瓙鍜屾暟閲�
*/
- int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId);
+ void updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer);
@@ -61,7 +61,7 @@
* @return //
* 宸ヤ綅鏄剧ず
*/
- List<Map<String, Object>> getTotalGlassDimensionsByWorkstation();
+ List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start,int end);
/**
@@ -70,4 +70,17 @@
* @return
*/
DownWorkstation selectByFlowCardId(String flowcardid);
+
+
+ /**
+ * @param downWorkstation
+ * @returnq 鍚敤绂佺敤
+ */
+ boolean updateDownWorkstationstate(DownWorkstation downWorkstation);
+
+ String closeAlarmSignal();
+
+ void autoPrint(Boolean flag);
+
+ void insertDownWorkstation();
}
--
Gitblit v1.8.0