From b10d86c964b11adbecc806924441f67662f36439 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 18 七月 2024 14:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/DownWorkstationService.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 7a1348b..a101328 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,17 +49,32 @@
/**
* @param flowCardId
- * @param glassInfoCount
+ *
* @param workstationId
* @return 鏇存柊鏋跺瓙鍜屾暟閲�
*/
- int updateFlowCardIdAndCount(String flowCardId, int glassInfoCount, int workstationId);
+ void updateFlowCardIdAndCount(String flowCardId, int workstationId,int layer);
- void insertdownglassinfo();
+
/**
* @return //
* 宸ヤ綅鏄剧ず
*/
- List<Map<String, Object>> getTotalGlassDimensionsByWorkstation();
+ List<Map<String, Object>> getTotalGlassDimensionsByWorkstation(int start,int end);
+
+
+ /**
+ * @param flowcardid
+ * 鏍规嵁娴佺▼鍗″彿鏌ヨ
+ * @return
+ */
+ DownWorkstation selectByFlowCardId(String flowcardid);
+
+
+ /**
+ * @param downWorkstation
+ * @returnq 鍚敤绂佺敤
+ */
+ boolean updateDownWorkstationstate(DownWorkstation downWorkstation);
}
--
Gitblit v1.8.0