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/engineering/controller/EngineeringController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index d155b60..1514655 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -107,9 +107,11 @@
 //        glassInfoService.deleteTask(engineering.getEngineerId());
 //        upPattenUsageService.deleteTask(engineering.getEngineerId());
 //        optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
+        //鏆傚仠宸ョ▼
+        engineeringService.pauseTask(engineering.getEngineerId(),0);
           //鏌ヨ鏈笂鐗囩殑灏忕墖淇℃伅
         List<GlassInfo>glasslist=glassInfoService.selectEdgGlassInfo(engineering.getEngineerId());
-        return Result.build(200, "鍒犻櫎鎴愬姛"+engineering, glasslist);
+        return Result.build(200, "鍒犻櫎鎴愬姛"+engineering.getEngineerId(), glasslist);
 
 
     }

--
Gitblit v1.8.0