From 6db39c1dfb1dca966983652e4360672cb58a96f6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期日, 31 三月 2024 12:40:45 +0800
Subject: [PATCH] 代码更新
---
springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 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 f1fa40e..18a8576 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;
}
@@ -319,6 +319,8 @@
homeMapper.UpdateQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
glassInfo.getGlasstype());
Map<String, Object> map = new HashMap<>();
+ PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
map.put("message", "200");
return Result.success(map);
}
@@ -363,7 +365,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 +380,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);
@@ -387,6 +401,7 @@
System.out.println(RemoveErrorData.size());
// 澶勭悊瀹屾垚 娣诲姞鏁版嵁搴�
+ int count=1;
for (Map map : RemoveErrorData) {
String key = map.get("base").toString() + "_" + map.get("height").toString() + "_"
+ map.get("thickness").toString() + "_" + map.get("films").toString();
@@ -397,16 +412,23 @@
Integer glasstype;
if (TypeData.get(key) == null) {
glasstype = homeMapper.SelectMaxType();
+ if (glasstype==null) {
+ glasstype=1;
+ }
} else {
glasstype = Integer.valueOf(value);
}
+ //
homeMapper.AddGlassinfo(map.get("order").toString(), glasstype,
- Integer.parseInt(map.get("glasstype").toString()) // 闇�瑕佽绠� 閰嶇墖ID
- , glasstype+"" // 闇�瑕佽绠� 鐜荤拑ID
+ Integer.parseInt(map.get("matching").toString()) // 闇�瑕佽绠� 閰嶇墖ID
+ ,map.get("order").toString()+"-"+count+"" // 闇�瑕佽绠� 鐜荤拑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()),groupby.get(tierkey));// 闇�瑕佽绠楁�诲眰鏁�
+ //璁㈠崟鍐呮�诲眰鏁�
+ homeMapper.InsertFlowcard(map.get("order").toString(),OrderFinishedProduct.get(tierkey+"_Sum"));
+ count++;
}
Map<String, Object> ResultCode = new HashMap<>();
ResultCode.put("message", "200");
--
Gitblit v1.8.0