From 6df95d633b4a0b21e6eb0a57e22feb7bbb6eb65d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 21 十二月 2023 16:47:39 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java b/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java
index d2a518a..94ca6f0 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java
@@ -17,6 +17,7 @@
@Autowired
private JdbcConnections jdbcConnections;
+ // 鑾峰彇鐜荤拑鏄惁鍦ㄧ瀛愶紝鏄惁鍦ㄥ嚭鐗囬槦鍒�
public List<north_glass_buffer1> SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
List<north_glass_buffer1> listAluminumFrame = jdbcConnections
.SelectGlassByGlassIdOrderIdFrameIdss(FrameBarcode);
@@ -27,18 +28,28 @@
return listAluminumFrame;
}
- public void AddOutSliceS(String FrameBarcode) throws SQLException{
- List<north_glass_buffer1> north_glass_buffer1s=SelectAluminumFrameInfoById(FrameBarcode);
+ // 鏍规嵁閾濇id娣诲姞鐜荤拑鍒板嚭鐗囬槦鍒�
+ public void AddOutSliceS(String FrameBarcode) throws SQLException {
+ List<north_glass_buffer1> north_glass_buffer1s = SelectAluminumFrameInfoById(FrameBarcode);
String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
- String position =jdbcConnections.SelectPositionByFrameBarcode(FrameBarcode);
- int sequence=homeMapper.SelectMaxSquence();
+ String position = jdbcConnections.SelectPositionByFrameBarcode(FrameBarcode);
+ int sequence = homeMapper.SelectMaxSquence();
+
for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
- if(north_glass_buffer1.getstorageCage()!=null&&north_glass_buffer1.getOut_slice()==null){
- homeMapper.AddOutSliceS(north_glass_buffer1.getbarcode(), flip, FrameBarcode, north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(), sequence, position);
- sequence+=1;
+ Short state = 0;
+ if (north_glass_buffer1.getOut_slice() == null) {
+ if (north_glass_buffer1.getstorageCage() == null) {
+ state = 3;
+ }
+ homeMapper.AddOutSliceS(north_glass_buffer1.getbarcode(), flip, FrameBarcode,
+ north_glass_buffer1.getglasslengthmm().toString(),
+ north_glass_buffer1.getglassheightmm().toString(), sequence, position, state,
+ north_glass_buffer1.getordernumber(), north_glass_buffer1.getlistnumber(),
+ north_glass_buffer1.getboxnumber(), north_glass_buffer1.getglasslength().toString(),
+ north_glass_buffer1.getglassheight().toString());
+ sequence += 1;
}
}
}
-
}
--
Gitblit v1.8.0