From 3acd15a13d9edfde79ee125af135d2a089b23872 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 09 十一月 2023 15:08:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 160024d..9a6cb6a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -37,7 +37,7 @@
if (glasslist == null) {
return (300);
}
- double widths = glasslist.getWidth();
+ double widths = glasslist.getwidth();
String orderids = glasslist.getOrderId();
List<String> adddresslist = new ArrayList<>();
@@ -74,7 +74,7 @@
cells = cages1.getCell();// 鏍煎瓙鍙�
prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
- widths = glasslist.getWidth();
+ widths = glasslist.getwidth();
// 鎵ц杩涚墖
datas.add((short) 1000);
@@ -143,7 +143,7 @@
// 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
for (int i = 2; i > 0; i--) {
Glass qglass = spianMapper.SelectQueueGlass(i);
- width = qglass.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
+ width = qglass.getwidth();// 鏍煎瓙鍓╀綑瀹藉害
spianMapper.UpdataAddqueCage(qglass.getOrderId(), qglass.getGlassId(), width, cage1, cells, i,
1);
spianMapper.UpdataAddCage1(width, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
@@ -166,7 +166,7 @@
Glass qglass = spianMapper.SelectQueueGlass(i);
String orderid = qglass.getOrderId().toString();
String glassid = qglass.getGlassId();
- widths = qglass.getWidth();
+ widths = qglass.getwidth();
List<StorageCage> storageCage = spianMapper.selectAll(orderid);
if (storageCage == null) {
return (400);
@@ -192,7 +192,7 @@
cells = cages1.getCell();// 鏍煎瓙鍙�
prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
width = cages1.getWidth();// 鏍煎瓙鍓╀綑瀹藉害
- widths = qglass.getWidth();
+ widths = qglass.getwidth();
// 鎵ц杩涚墖
datas.add((short) 1000);
--
Gitblit v1.8.0