From 5af1f5cf615811334009eaf39dc7eb9e30ad96e0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 21 十二月 2023 11:50:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 6f74524..a5acaf6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -141,14 +141,14 @@
public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, glassid);
- StorageCage glass = homeMapper.SelectGlassInfo(glassid);
+ // StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
homeMapper.UpdateCageTask1(glassid);
- S7control.getinstance().WriteWord("DB105.14", (short) 0);
+ // S7control.getinstance().WriteWord("DB105.16", (short) 0);
} else {
- spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
- homeMapper.UpdateCageTask2(glassid);
- S7control.getinstance().WriteWord("DB105.12", (short) 0);
+ // spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ homeMapper.DeleteByGlassID(glassid);
+ // S7control.getinstance().WriteWord("DB105.18", (short) 0);
}
map.put("message3", "200");
return Result.success(map);
@@ -195,14 +195,14 @@
String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
if (position != null) {
int sequence = homeMapper.SelectMaxSquence();
+
homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),
- sequence, position, 0);
+ sequence, position, (short)0);
map.put("message2", "200");
} else {
map.put("message2", "300");
}
-
} else {
map.put("message2", "400");
}
--
Gitblit v1.8.0