From ea46f28356e2acb3bc7cc69b9af3c52fab38c0b0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 16:56:47 +0800
Subject: [PATCH] 终止任务功能测试
---
springboot-vue3/src/main/java/com/example/springboot/service/North_Glass_Buffer1Service.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 bcd8410..fcb0582 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
@@ -26,15 +26,15 @@
public int compare(north_glass_buffer1 n1, north_glass_buffer1 n2) {//瀵规煡璇㈠埌鐨勯摑妗嗗搴旂殑鐜荤拑鏁版嵁杩涜鎺掑簭锛屽皢绂诲嚭鐗囦綅缃繎鐨勶紝闈犺繎绗煎瓙鍑虹墖渚х殑鐜荤拑鎺掑湪鍓嶉潰
if (n1.getstorageCage() != null) {
if (n2.getstorageCage() != null) {
- int cageComparison = n2.getstorageCage().getCage().compareTo(n1.getstorageCage().getCage());
+ int cageComparison = n2.getstorageCage().getCage().compareTo(n1.getstorageCage().getCage());//闈犲嚭鐗囧彛杩戠殑绗煎瓙浼樺厛
if (cageComparison != 0) {
return cageComparison;
} else {
- int cellComparison = n2.getstorageCage().getCell().compareTo(n1.getstorageCage().getCell());
+ int cellComparison = n2.getstorageCage().getCell().compareTo(n1.getstorageCage().getCell());//闈犲嚭鐗囧彛杩戠殑鏍煎瓙浼樺厛
if (cellComparison != 0) {
return cellComparison;
} else {
- return n2.getstorageCage().getTier().compareTo(n1.getstorageCage().getTier());
+ return n2.getstorageCage().getTier().compareTo(n1.getstorageCage().getTier());//闈犲嚭鐗囧彛杩戠殑鏍煎瓙澶栧眰浼樺厛
}
}
} else {
@@ -56,7 +56,7 @@
north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
}
- // 瀵瑰祵濂楃被鐨勫叾涓竴鍒楄繘琛屾帓搴�
+ // 瀵瑰祵濂楃被杩涜鎺掑簭
Collections.sort(listAluminumFrame, new north_glass_buffer1Comparator());
return listAluminumFrame;
}
@@ -66,6 +66,8 @@
List<north_glass_buffer1> north_glass_buffer1s = SelectAluminumFrameInfoById(FrameBarcode);
String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
String position = jdbcConnections.SelectPositionByFrameBarcode(FrameBarcode);
+ String framelength=jdbcConnections.SelectFrameLengthByFrameBarcode(FrameBarcode);
+ String frameheight=jdbcConnections.SelectFrameHeightByFrameBarcode(FrameBarcode);
int sequence = homeMapper.SelectMaxSquence();
for (north_glass_buffer1 north_glass_buffer1 : north_glass_buffer1s) {
Short state = 0;
@@ -78,7 +80,7 @@
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());
+ north_glass_buffer1.getglassheight().toString(),framelength,frameheight);
sequence += 1;
}
}
--
Gitblit v1.8.0