From 625d2b6dd9bd4a1c63bf7e1b2701393d908f7a81 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 五月 2024 08:31:12 +0800
Subject: [PATCH] 客户数据库变更，部分铝框没有对应玻璃信息，扫码添加出片队列时，当铝框没有对应玻璃时直接添加到出片队列
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 5 ++++-
1 files changed, 4 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 8dbb53f..c207593 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;
@@ -178,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 != "") {
@@ -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);
@@ -405,6 +407,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