From 92dab966727b26c69a8a1d5839b064f7942895e8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 五月 2024 09:20:33 +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 | 9 +++++----
1 files changed, 5 insertions(+), 4 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 7a28788..6b21734 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
@@ -178,10 +178,10 @@
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) {
+ if (flip != null&&flip != "") {
String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
if (position != null) {
String framelength = jdbcConnections.SelectFrameLengthByFrameBarcode(north_glass_buffer1.getFrameBarcode());
@@ -274,7 +274,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);
}
@@ -329,6 +329,7 @@
// public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws
// SQLException {
north_Glass_Buffer1Service.AddOutSliceS(FrameNo);
+ Plchome.AluminumFrame = null;
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -363,7 +364,7 @@
return Result.success(map);
}
- // 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
+ // 淇槸鍚﹂渶瑕佺‘璁�
@PostMapping("/isConfirmStates")
public Result isConfirmStates(Boolean isConfirmStates) {
Plchome.isConfirm = isConfirmStates;
--
Gitblit v1.8.0