From 8891898a6ae6229ede66c8005f2912c75ddc6d90 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 三月 2025 22:32:26 +0800
Subject: [PATCH] 1、fixbug:中空任务领取部分对数玻璃后继续领任务，任务显示异常bug解决 2、大理片笼/中空理片笼显示异常bug:进片任务计算目标格子后，预先将笼子插入一条记录，界面相同判断时显示存在歧义，修改数据返回逻辑：在没有目标格子前提下，如果笼内存在玻璃显示相同，有目标格子后笼内有数据不显示 3、中空理片笼进片任务优化：中空可能存在脏数据，原因人为操作或订单多补片造成中空关系订单数量与实际数据不匹配，实际数量大于订单数量，系统会重新生成一份关系造成关系进笼玻璃数据顺序存在重复而无法进笼。
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 74e0e71..217fadc 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -9,6 +9,7 @@
import com.mes.tools.WebSocketServer;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
+import com.mes.utils.RedisUtil;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import lombok.extern.slf4j.Slf4j;
@@ -34,7 +35,8 @@
private UpPattenUsageService upPattenUsageService;
@Autowired
private OptimizeProjectService optimizeProjectService;
-
+ @Autowired
+ RedisUtil redisUtil;
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@@ -123,20 +125,28 @@
if(upPattenUsages!=null){
jsonObject.append("prioritylist", upPattenUsages);
}
- //鏌ヨ1銆�2鍙风嚎鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
+ //鏌ヨ1鍙风嚎鐨勪换鍔�
+ Engineering request = redisUtil.getCacheObject("loadGlassRequest");
+ if (request == null) {
+ request = new Engineering();
+ request.setStationCell(5);
+ }
+ List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(request);
jsonObject.append("loadTask1", upPattenUsages1);
- //鏌ヨ1銆�2鍙风嚎鐨勪换鍔�
- List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
+ //鏌ヨ2鍙风嚎鐨勪换鍔�
+ Engineering request2 = redisUtil.getCacheObject("loadGlassRequest2");
+ if (request2 == null) {
+ request2 = new Engineering();
+ request2.setStationCell(6);
+ }
+ List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(request2);
jsonObject.append("loadTask2", upPattenUsages2);
-
+ //鏌ヨ宸ヤ綅浠诲姟
+
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
- //鏄惁寮�濮嬪伐绋�
- Engineering engineering = engineeringService.selectInitiate(1);
- jsonObject.append("engineering", engineering);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
if (sendwServer != null) {
--
Gitblit v1.8.0