From a1d6635a9964c5f4798ebc7cea2dacfae14af326 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 20 五月 2024 13:36:16 +0800
Subject: [PATCH] 修改界面显示
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 e06e23f..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;
@@ -106,14 +107,15 @@
// 鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
@GetMapping("/Addglassid")
- public Result Addglassid(String glassid) {
+ public Result Addglassid(String glassid) throws SQLException {
Map<String, Object> map = new HashMap<>();
short taskno = homeMapper.SelectInTask();
if (taskno > 0) {
map.put("message2", "500");
} else {
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results = spianService.selectAll(glassid);
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
+ short results = spianService.selectAll(north_glass_buffer1);
if (results == 200) {
map.put("message2", "200");
} else if (results == 300) {
@@ -177,7 +179,7 @@
Map<String, Object> map = new HashMap<>();
Out_slice result = homeMapper.SelectQueueByglassid(glassid);
if (result == null) {
- north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdout(glassid, "", "");
String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
if (flip != null&&flip != "") {
@@ -248,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) {
@@ -273,7 +275,7 @@
// 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@PostMapping("/InsertQueueGlassId")
- public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
+ public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) throws SQLException {
return storageCageService.InsertQueueGlassId(id, queue);
}
@@ -310,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);
@@ -328,6 +331,8 @@
// public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws
// 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);
@@ -403,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