From dc7e0180c54cb5576030585983502cb256eeee14 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 20 六月 2024 22:05:39 +0800
Subject: [PATCH] 1、大理片笼进出片任务逻辑初次提交:单元测试已完成,待优化 2、删除重复无用的钢化小片表、玻璃小片表 3、删除玻璃小片mapper层接口多继承无用父类 4、调整按照工程号获取优化详情表内的宽高

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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 3421f33..e62c4cb 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
@@ -42,18 +42,24 @@
     public  Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
         boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
         List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
-        log.info("StartorStop:{},{}", work,engineering);
-        return Result.build(200, engineering.getEngineerId(),glass);
+        if(work){
+            return Result.build(200,"鎴愬姛",glass);
+        }else {
+            return Result.build(100,"澶辫触",glass);
+        }
     }
 
     @ApiOperation("鏆傚仠")
     @PostMapping("/pause") //鏆傚仠涓婄墖浠诲姟
     @ResponseBody
     public  Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
-        boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
-        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
-        log.info("StartorStop:{},{}", work,engineering);
-        return Result.build(200, engineering.getEngineerId(),glass);
+        boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
+        List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
+        if(work){
+            return Result.build(200,"鎴愬姛",glass);
+        }else {
+            return Result.build(100,"鎴愬姛",glass);
+        }
     }
 
     @ApiOperation("寮�濮嬩笂鐗�")

--
Gitblit v1.8.0