From 183c3ed6b30e3edf5e44c8bd2128d3be968bc1f4 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 20 五月 2024 13:47:50 +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 | 3 ++-
1 files changed, 2 insertions(+), 1 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 c207593..29cfe1f 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
@@ -250,7 +250,7 @@
Map<String, Object> map = new HashMap<>();
short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
Double cagewidth = homeMapper.SelectCageWidth(cage, cell);
- if (cagewidth - queue.getglasswidth() - 400 < 0 || (cagewidth == 2750 && queue.getglasswidth() > cagewidth)) {
+ if (cagewidth - queue.getglasswidth() - 600 < 0 || (cagewidth == 2750 && queue.getglasswidth() > cagewidth)) {
map.put("message", "400");
} else {
if (result > 0) {
@@ -332,6 +332,7 @@
// SQLException {
north_Glass_Buffer1Service.AddOutSliceS(FrameNo);
Plchome.AluminumFrame = null;
+ Plchome.AluminumFrameInfo = new north_frame_buffer1_frames();
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
--
Gitblit v1.8.0