From 6ff1b66c16a506d8f40b7284c1c3774faf1e6d2e Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 16:45:45 +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 | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 08268b3..66aef59 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
@@ -3,6 +3,9 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.service.GlassInfoService;
+import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.Result;
@@ -29,17 +32,51 @@
private EngineeringService engineeringService;
@Autowired
private UpPattenUsageService upPattenUsageService;
-
+ @Autowired
+ private GlassInfoService glassInfoService;
+ @Autowired
+ private OptimizeProjectService optimizeProjectService;
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
- @PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
+ @PostMapping("/pauseTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
- public Result <List<UpPattenUsage>> changeTask(@RequestBody Engineering engineering) {
+ 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);
}
+ @ApiOperation("寮�濮嬩笂鐗�")
+ @PostMapping("/changeTask") //璋冪敤涓婄墖浠诲姟
+ @ResponseBody
+ public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
+ log.info("engineeringId:{}", engineering);
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
+ if (upPattenUsage != null) {
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
+ return Result.build(200, "宸蹭繚瀛樿繃", work);
+ } else {
+ List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
+ log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
+ upPattenUsageService.saveUpPattenUsage(upPattenUsages);
+ log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
+ List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering.getEngineerId());
+ glassInfoService.saveGlassInfo(glassinfo);
+ log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
+ List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
+ engineeringService.saveEngineering(listEngineering);
+ log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
+ //灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
+ optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
+ return Result.build(200, "淇濆瓨鎴愬姛", work);
+ }
+
+ }
+
@ApiOperation("鏌ヨ鍙互涓婄墖鐨勫伐绋嬪彿")
@GetMapping("/selectTask") //璋冪敤涓婄墖浠诲姟
@ResponseBody
--
Gitblit v1.8.0