From 1de52d82ec5c3fb56e095a36571ab32bfdb15ca4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 31 三月 2024 13:25:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index 18a8576..cef5c03 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -291,11 +291,11 @@
}
// 寮�濮嬩换鍔�
- public Result ClaimTasks(String flowcard, Integer state) {
+ public Result ClaimTasks(String flowcard, Integer state, Integer line) {
if (state == 1) {
- homeMapper.ClaimTasks(flowcard, 0);
+ homeMapper.ClaimTasks(flowcard, 0,line);
} else {
- homeMapper.ClaimTasks(flowcard, 1);
+ homeMapper.ClaimTasks(flowcard, 1,line);
}
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -317,7 +317,7 @@
// 淇敼娴嬮噺淇℃伅
public Result UpdateQueue(GlassInfo glassInfo) {
homeMapper.UpdateQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
- glassInfo.getGlasstype());
+ glassInfo.getGlasstype(),glassInfo.getThickness());
Map<String, Object> map = new HashMap<>();
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
--
Gitblit v1.8.0