From 59ad6aed9fc23a494e597eb1dfc30d46dbdd068c Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 17 二月 2025 14:17:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 0118321..74e0e71 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
@@ -123,6 +123,13 @@
if(upPattenUsages!=null){
jsonObject.append("prioritylist", upPattenUsages);
}
+ //鏌ヨ1銆�2鍙风嚎鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages1 = upPattenUsageService.selectLoadTask(5);
+ jsonObject.append("loadTask1", upPattenUsages1);
+ //鏌ヨ1銆�2鍙风嚎鐨勪换鍔�
+ List<UpPattenUsage> upPattenUsages2 = upPattenUsageService.selectLoadTask(6);
+ jsonObject.append("loadTask2", upPattenUsages2);
+
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
--
Gitblit v1.8.0