From ea8859c58b8fd24a54f7a838d6f8eaa98d57fb65 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 18 十二月 2024 11:44:07 +0800
Subject: [PATCH] 1、大理片笼进出片任务新增限制：进片玻璃数大于可用格子时，不允许进片 2、超过最大尺寸且直通通道有玻璃时 不能进片 3、大理片超过最大高度走直通通道 4、fixbug:笼子厚度限制
---
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