From 6c584c489a317cee78729707890db4bb1ee3f062 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 29 五月 2024 14:33:36 +0800
Subject: [PATCH] 修改进片找格子的判断
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 6 +++++-
1 files changed, 5 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 6b21734..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
@@ -23,6 +23,7 @@
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
+import com.example.springboot.entity.north_frame_buffer1_frames;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
@@ -249,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) {
@@ -311,6 +312,7 @@
public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
List<north_glass_buffer1> AluminumFrame = north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
+ Plchome.AluminumFrameInfo=jdbcConnections.SelectFrameBarcode(FrameBarcode);
Map<String, Object> map = new HashMap<>();
map.put("AluminumFrame", AluminumFrame);
map.put("flip", flip);
@@ -330,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);
@@ -405,6 +408,7 @@
@PostMapping("/CloseForm7")
public Result CloseForm7() {
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