From 909f17bed439e4f80fb6832ba0e9f13bb629ce56 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 三月 2025 16:41:36 +0800
Subject: [PATCH] 上片历史任务类添加原片厚度，膜系字段 修改中空历史任务接口
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 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 497935f..bf20572 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
@@ -1,20 +1,22 @@
package com.mes.engineering.controller;
+
import com.mes.damage.entity.Damage;
+import com.mes.damage.entity.request.DamageRequest;
import com.mes.damage.service.DamageService;
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.temperingglass.entity.TemperingGlassInfo;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.service.UpPattenUsageService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -42,6 +44,7 @@
@Autowired
DamageService damageService;
+
@ApiOperation("寮�濮�/鏆傚仠浠诲姟/浼犻�掑伐绋嬪彿鍜岀姸鎬�,寮�濮嬫槸1 鏆傚仠鏄�0")
@PostMapping("/pauseTask") //鏆傚仠涓婄墖浠诲姟
@ResponseBody
@@ -64,7 +67,7 @@
if(work){
return Result.build(200, "鎴愬姛", null);
}else {
- return Result.build(100, "鎴愬姛", null);
+ return Result.build(100, "澶辨晽", null);
}
}
@@ -74,17 +77,19 @@
public Result <Boolean> changeTask(@RequestBody Engineering engineering) {
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
- if (upPattenUsage != null) {
+ Engineering engineerings = engineeringService.selectUpInitiate(engineering.getEngineerId());
+ GlassInfo glassInfos = engineeringService.selectGlassinfoIsnull(engineering.getEngineerId());
+ if (upPattenUsage != null && engineerings != null && glassInfos != null) {
boolean work = engineeringService.changeTasks(engineering);
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
- return Result.build(200, "宸蹭繚瀛樿繃", work);
- } else {
+ return Result.build(200, "寮�濮嬩笂鐗�", work);
+ } else if (upPattenUsage == null && engineerings == null && glassInfos == null) {
List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
log.info("灏嗘煡璇㈠嚭鐨刄pPattenUsage鏁版嵁淇濆瓨鍒版暟鎹簱琛ㄩ噷");
upPattenUsageService.saveUpPattenUsage(upPattenUsages);
log.info("浠嶱P琛ㄦ煡璇lassinfo鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
- List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering.getEngineerId());
+ List<GlassInfo> glassinfo = glassInfoService.selectGlassInfo(engineering);
glassInfoService.saveGlassInfo(glassinfo);
log.info("浠嶱P琛ㄦ煡璇ngineering鐨勬暟鎹苟淇濆瓨鍒拌〃閲�");
List<Engineering> listEngineering = engineeringService.selectEngineering(engineering.getEngineerId());
@@ -99,6 +104,11 @@
}else {
return Result.build(200, "淇濆瓨澶辫触"+engineering.getEngineerId(), false);
}
+ } else {
+ upPattenUsageService.deleteTask(engineering.getEngineerId());
+ engineeringService.deleteTask(engineering.getEngineerId());
+ glassInfoService.deleteTask(engineering.getEngineerId());
+ return Result.build(200, "璇烽噸鏂扮偣鍑讳笂鐗�" + engineering.getEngineerId(), true);
}
}
@@ -137,5 +147,11 @@
return Result.build(200, "鎿嶄綔鎴愬姛", null);
}
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
+ @PostMapping("/identControls")
+ public Result<String> identControls(@RequestBody @Validated DamageRequest request) {
+ return Result.build(200, "鎴愬姛", upPattenUsageService.identControls(request));
+ }
+
}
--
Gitblit v1.8.0