From 9a942fabdc8afdc9610425641739d5b97cbcb79a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期日, 24 三月 2024 10:01:18 +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 | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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..883b3db 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鍖烘枃浠�
@@ -351,43 +355,58 @@
// 绛涢�夊鐞嗘暟鎹� 1.鍘婚櫎鏃犵敤鏁版嵁 2.璁＄畻閰嶇墖ID 3.璁＄畻ID 4. 璁＄畻鎬诲眰鏁�
List<Map> TypeDatas = homeMapper.SelectType();
Map<String, String> TypeData = new HashMap<String, String>();// 寰楀埌澶勭悊瀹屽悗鎵�鏈夌殑绫诲瀷
+ Map<String, Integer> groupby=new HashMap<String, Integer>(); // 寰楀埌澶勭悊瀹屽悗鎵�鏈夋�诲眰鏁�;
List<Map> RemoveErrorData = IportDataStr.stream()
.filter(item -> (item.get("order") != null && item.get("glasstype") != null && item.get("tier") != null
&&
item.get("films") != null && item.get("base") != null && item.get("height") != null
- && item.get("thickness") != null && item.get("quantity") != null))
+ && item.get("thickness") != null && item.get("quantity") != null&& item.get("matching") != null))
.collect(Collectors.toList());
- // 鍙栧嚭RemoveErrorData 閲岄潰鐨勫垪褰撲綔TypeData鐨刱ey
TypeDatas.forEach(item -> {
TypeData.put(item.get("type").toString(), item.get("glasstype").toString());
});
+ RemoveErrorData.forEach(item -> {
+ String key=item.get("order").toString()+"_"+item.get("matching").toString();
+ if (groupby.get(key)!=null) {
+ Integer Tiers=groupby.get(key)+1;
+ groupby.put(key, Tiers);
+ }else{
+ groupby.put(key, 1);
+ }
+ });
+
System.out.println(RemoveErrorData.size());
// 澶勭悊瀹屾垚 娣诲姞鏁版嵁搴�
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 tierkey = map.get("order").toString() + "_" + map.get("matching").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
- , map.get("glasstype").toString() // 闇�瑕佽绠� 鐜荤拑ID
+ , glasstype+"" // 闇�瑕佽绠� 鐜荤拑ID
, Integer.parseInt(map.get("tier").toString()), map.get("films").toString(),
Double.parseDouble(map.get("base").toString()), Double.parseDouble(map.get("height").toString()),
Double.parseDouble(map.get("thickness").toString()),
- Integer.parseInt(map.get("quantity").toString()), 1);// 闇�瑕佽绠楁�诲眰鏁�
+ Integer.parseInt(map.get("quantity").toString()),groupby.get(tierkey));// 闇�瑕佽绠楁�诲眰鏁�
}
Map<String, Object> ResultCode = new HashMap<>();
ResultCode.put("message", "200");
return Result.success(ResultCode);
}
+
+
+
}
--
Gitblit v1.8.0