From ad7f461a110cd30ae219bcaa977bbeb0c8409599 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 29 五月 2024 08:13:26 +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 | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 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..0025656 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
@@ -223,7 +223,7 @@
homeMapper.DeleteStroageCageByCell(cell);
} else {
homeMapper.updateStroageCageByCell(cell, num);
- homeMapper.UpdateStroageCageWidthByCell(cell);
+ homeMapper.UpdateStroageCageWidthByCell(cell);// 淇敼绗煎瓙瀹藉害
}
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -250,6 +250,7 @@
homeMapper.FinishTask(storageTask.getId());// 瀹屾垚浠诲姟
if (storageTask.getTaskType().equals("0")) {
UpdateStroageCageByCell(Integer.parseInt(storageTask.getLoadrack()), 1);// 鐜荤拑鏁伴噺+1
+ homeMapper.DeletequeueByGlassid(storageTask.getGlassId());
} else {
StorageCage storageCage = homeMapper.SelectStorageByCell(storageTask.getShelfRack());
if (storageCage.getNumber() > 1) {
@@ -284,18 +285,18 @@
// 鏌ヨ璁㈠崟浠诲姟
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;
}
// 寮�濮嬩换鍔�
- public Result ClaimTasks(String flowcard, Integer state) {
+ public Result ClaimTasks(String flowcard, Integer state, Integer line) {
if (state == 1) {
- homeMapper.ClaimTasks(flowcard, 0);
+ homeMapper.ClaimTasks(flowcard, 0, line);
} else {
- homeMapper.ClaimTasks(flowcard, 1);
+ homeMapper.ClaimTasks(flowcard, 1, line);
}
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
@@ -317,8 +318,10 @@
// 淇敼娴嬮噺淇℃伅
public Result UpdateQueue(GlassInfo glassInfo) {
homeMapper.UpdateQueue(glassInfo.getFlowcard(), glassInfo.getWidth(), glassInfo.getHeight(),
- glassInfo.getGlasstype());
+ glassInfo.getGlasstype(), glassInfo.getThickness(), glassInfo.getTier());
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);
}
@@ -332,11 +335,19 @@
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
// 绉婚櫎
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 3);
- //鍒犻櫎鏁版嵁
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 3);
+ // 鍒犻櫎鏁版嵁
QueueMapper.DeleteErrorQueue();
-
+
// plcmes.getPlcParameter("GaToMES").setValue("3");
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 寮�濮嬪伐绋�
+ public Result StartChange(String flowcard) {
+ homeMapper.StartChange(flowcard, 1);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
@@ -347,8 +358,8 @@
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
// 閲嶆柊娴嬮噺
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 2);
- //鍒犻櫎鏁版嵁
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(), (short) 2);
+ // 鍒犻櫎鏁版嵁
QueueMapper.DeleteErrorQueue();
// plcmes.getPlcParameter("GaToMES").setValue("2");
Map<String, Object> map = new HashMap<>();
@@ -362,13 +373,15 @@
// 绛涢�夊鐞嗘暟鎹� 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>(); // 寰楀埌澶勭悊瀹屽悗鎵�鏈夋�诲眰鏁�;
-
+ 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
&&
item.get("films") != null && item.get("base") != null && item.get("height") != null
- && item.get("thickness") != null && item.get("quantity") != null&& item.get("matching") != null))
+ && item.get("thickness") != null && item.get("quantity") != null
+ && item.get("matching") != null))
.collect(Collectors.toList());
TypeDatas.forEach(item -> {
@@ -376,20 +389,34 @@
});
RemoveErrorData.forEach(item -> {
- String key=item.get("order").toString()+"_"+item.get("matching").toString();
- if (groupby.get(key)!=null) {
- Integer Tiers=groupby.get(key)+1;
+ 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);
- }else{
+ } else {
groupby.put(key, 1);
- }
+ }
});
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();
+ + map.get("thickness").toString() + "_" + map.get("films").toString();
String tierkey = map.get("order").toString() + "_" + map.get("matching").toString();
@@ -397,23 +424,27 @@
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));// 闇�瑕佽绠楁�诲眰鏁�
+ 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");
return Result.success(ResultCode);
}
-
-
-
}
--
Gitblit v1.8.0