From 9257c4f5158ede88dff4906c3a0e2d4bea501846 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 05 六月 2024 08:20:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 12 +++++++++++-
1 files changed, 11 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 66aef59..3421f33 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
@@ -37,7 +37,7 @@
@Autowired
private OptimizeProjectService optimizeProjectService;
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
- @PostMapping("/pauseTask") //璋冪敤涓婄墖浠诲姟
+ @PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
public Result <List<UpPattenUsage>> pauseTask(@RequestBody Engineering engineering) {
boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
@@ -46,6 +46,16 @@
return Result.build(200, engineering.getEngineerId(),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);
+ }
+
@ApiOperation("寮�濮嬩笂鐗�")
@PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
--
Gitblit v1.8.0