From 814323aa300f65154c299a9f3b1c44aa6cb5e9c6 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 22 三月 2024 10:59:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
index 742d175..be840ea 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
@@ -319,6 +319,10 @@
return Result.success(map);
}
+ public List<StorageCage> SelectStorageCageByCage(int cage) {
+ return homeMapper.SelectStorageCageByCage(cage);
+ }
+
// 浜哄伐鎷胯蛋
public Result ManualTake(String glassInfo) {
// 璇诲彇DB105鍖烘枃浠�
@@ -368,14 +372,15 @@
// 澶勭悊瀹屾垚 娣诲姞鏁版嵁搴�
for (Map map : RemoveErrorData) {
// GlassInfo glassInfo = mapper.convertValue(map, GlassInfo.class);
-
- String key=map.get("base").toString()+"_"+map.get("height").toString()+"_"+map.get("thickness").toString()+"_"+map.get("films").toString();
- String value=TypeData.get(key);
+
+ String key = map.get("base").toString() + "_" + map.get("height").toString() + "_"
+ + map.get("thickness").toString() + "_" + map.get("films").toString();
+ String value = TypeData.get(key);
Integer glasstype;
- if (TypeData.get(key)==null) {
- glasstype=homeMapper.SelectMaxType();
- }else{
- glasstype=Integer.valueOf(value);
+ if (TypeData.get(key) == null) {
+ glasstype = homeMapper.SelectMaxType();
+ } else {
+ glasstype = Integer.valueOf(value);
}
homeMapper.AddGlassinfo(map.get("order").toString(), glasstype,
Integer.parseInt(map.get("glasstype").toString()) // 闇�瑕佽绠� 閰嶇墖ID
@@ -390,4 +395,7 @@
return Result.success(ResultCode);
}
+
+
+
}
--
Gitblit v1.8.0