From e7110f57152cc0428dfa18ea34a924b06b2d89b3 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:12:53 +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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..816e5a1 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
@@ -223,7 +223,7 @@
homeMapper.DeleteStroageCageByCell(cell);
} else {
homeMapper.updateStroageCageByCell(cell, num);
- homeMapper.UpdateStroageCageWidthByCell(cell);
+ homeMapper.UpdateStroageCageWidthByCell(cell);//淇敼绗煎瓙瀹藉害
}
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -250,6 +250,7 @@
homeMapper.FinishTask(storageTask.getId());// 瀹屾垚浠诲姟
if (storageTask.getTaskType().equals("0")) {
UpdateStroageCageByCell(Integer.parseInt(storageTask.getLoadrack()), 1);// 鐜荤拑鏁伴噺+1
+ homeMapper.DeletequeueByGlassid(storageTask.getGlassId());
} else {
StorageCage storageCage = homeMapper.SelectStorageByCell(storageTask.getShelfRack());
if (storageCage.getNumber() > 1) {
@@ -291,11 +292,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 +318,7 @@
// 淇敼娴嬮噺淇℃伅
public Result UpdateQueue(GlassInfo glassInfo) {
homeMapper.UpdateQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
- glassInfo.getGlasstype());
+ glassInfo.getGlasstype(),glassInfo.getThickness(),glassInfo.getTier());
Map<String, Object> map = new HashMap<>();
PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
--
Gitblit v1.8.0