From 5b238a4f037c1fe2e2af8769e62f75b8ff2d389a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 11 十二月 2024 16:12:17 +0800
Subject: [PATCH] 上片模块新增删除工程
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 19 ++++++++++++++++++-
1 files changed, 18 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 26cd5c3..62ab37d 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
@@ -67,7 +67,7 @@
@ResponseBody
public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
log.info("engineeringId:{}", engineering);
- UpPattenUsage upPattenUsage = upPattenUsageService.selectedTaskEngineering(engineering.getEngineerId());
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage != null) {
boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
@@ -97,6 +97,23 @@
}
+ @ApiOperation("鍒犻櫎宸ョ▼涓婄墖")
+ @PostMapping("/deleteTask") //璋冪敤涓婄墖浠诲姟
+ @ResponseBody
+ public Result <Boolean> deleteTask(@RequestBody Engineering engineering) {
+ //鍒犻櫎宸ョ▼琛ㄣ�佸皬鐗囪〃銆佷笂鐗囪〃锛屾洿鏀逛紭鍖栬〃鐘舵��
+ boolean work=engineeringService.deleteTask(engineering.getEngineerId());
+ glassInfoService.deleteTask(engineering.getEngineerId());
+ upPattenUsageService.deleteTask(engineering.getEngineerId());
+ optimizeProjectService.changeTask(engineering.getEngineerId(), 100);
+ if (work) {
+ return Result.build(200, "鍒犻櫎鎴愬姛"+engineering.getEngineerId(), true);
+ }else {
+ return Result.build(200, "鍒犻櫎澶辫触"+engineering.getEngineerId(), false);
+ }
+
+ }
+
@ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿")
@GetMapping("/selectTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
--
Gitblit v1.8.0