From 21092d29c1c0cd1003bb32bf91fddae265a8baea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 20 十一月 2024 08:41:11 +0800
Subject: [PATCH] 1、卧理单条磨边线对接完成,另一条线等待IP确认 2、大理片笼提交部分代码

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 5e9e82d..a548f00 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
@@ -69,7 +69,7 @@
         log.info("engineeringId:{}", engineering);
         UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
         if (upPattenUsage != null) {
-            boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());
             List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
             optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
             return Result.build(200, "宸蹭繚瀛樿繃", work);
@@ -85,7 +85,7 @@
             engineeringService.saveEngineering(listEngineering);
             log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
             //灏唀ngineering琛ㄧ姸鎬佷负姝e湪涓婄墖
-            boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+            boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState(), engineering.getFilmRemove(), engineering.getStationCell());
             List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
             optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
             if (work) {

--
Gitblit v1.8.0