From 6e7b0553632cae15c79c259aeb93edfd61a5f297 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 25 三月 2024 15:59:29 +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, 18 insertions(+), 4 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 912cdbb..ee61e88 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
@@ -284,9 +284,9 @@
// 鏌ヨ璁㈠崟浠诲姟
public List<FlowCard> SelectOrderTask() {
List<FlowCard> OrderTask = homeMapper.SelectOrderTask();
- // for (FlowCard flowcard : OrderTask) {
- // flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
- // }
+ for (FlowCard flowcard : OrderTask) {
+ flowcard.setglassinfo(homeMapper.SelectOrderView(flowcard.getFlowcard()));
+ }
return OrderTask;
}
@@ -363,7 +363,8 @@
List<Map> TypeDatas = homeMapper.SelectType();
Map<String, String> TypeData = new HashMap<String, String>();// 寰楀埌澶勭悊瀹屽悗鎵�鏈夌殑绫诲瀷
Map<String, Integer> groupby=new HashMap<String, Integer>(); // 寰楀埌澶勭悊瀹屽悗鎵�鏈夋�诲眰鏁�;
-
+ Map<String, Integer> OrderFinishedProduct=new HashMap<String, Integer>(); // 寰楀埌澶勭悊瀹屽悗璁㈠崟鎴愬搧鎬绘暟閲�;
+ //"order zong 0 1 10 2 10"
List<Map> RemoveErrorData = IportDataStr.stream()
.filter(item -> (item.get("order") != null && item.get("glasstype") != null && item.get("tier") != null
&&
@@ -377,6 +378,17 @@
RemoveErrorData.forEach(item -> {
String key=item.get("order").toString()+"_"+item.get("matching").toString();
+ String keyCount=item.get("order").toString()+"_"+item.get("matching").toString()+"_"+item.get("tier").toString();
+ String keyCountSum=item.get("order").toString()+"_"+item.get("matching").toString()+"_Sum";//璁㈠崟鎬绘暟
+ if (OrderFinishedProduct.get(keyCount)!=null) {
+ Integer count=OrderFinishedProduct.get(keyCount)+1;
+ Integer sumcount=OrderFinishedProduct.get(keyCountSum)+Integer.parseInt(item.get("quantity").toString());
+ OrderFinishedProduct.put(keyCount,count);
+ OrderFinishedProduct.put(keyCountSum,sumcount);
+ }else if(OrderFinishedProduct.get(keyCount)==null&&groupby.get(key)==null){
+ OrderFinishedProduct.put(keyCount,1);
+ OrderFinishedProduct.put(keyCountSum,Integer.parseInt(item.get("quantity").toString()));
+ }
if (groupby.get(key)!=null) {
Integer Tiers=groupby.get(key)+1;
groupby.put(key, Tiers);
@@ -407,6 +419,8 @@
Double.parseDouble(map.get("base").toString()), Double.parseDouble(map.get("height").toString()),
Double.parseDouble(map.get("thickness").toString()),
Integer.parseInt(map.get("quantity").toString()),groupby.get(tierkey));// 闇�瑕佽绠楁�诲眰鏁�
+ //璁㈠崟鍐呮�诲眰鏁�
+ homeMapper.InsertFlowcard(map.get("order").toString(),OrderFinishedProduct.get(tierkey+"_Sum"));
}
Map<String, Object> ResultCode = new HashMap<>();
ResultCode.put("message", "200");
--
Gitblit v1.8.0