From aea7379082d3a9d53a35f62e8ff435254be8d213 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 04 十一月 2025 19:46:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
index ee87a6f..69724e6 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java
@@ -6,19 +6,19 @@
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.dto.GlassInfoLackDTO;
import com.mes.bigstorage.entity.dto.TemperingGlassCountDTO;
+import com.mes.bigstorage.entity.request.BigCageDetailsRequest;
import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
+import com.mes.bigstorage.entity.vo.BigCageDetailsVO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
import com.mes.common.config.Const;
+import com.mes.pp.entity.OptimizeProject;
import com.mes.utils.RedisUtil;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -114,6 +114,17 @@
}
}
+ @ApiOperation("鍙栨秷褰撳墠閽㈠寲")
+ @PostMapping("/cancelTemperingTask")
+ public Result<Boolean> cancelTemperingTask() {
+ boolean result = bigStorageCageDetailsService.cancelTemperingTask();
+ if (result == true) {
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲鎴愬姛", result);
+ } else {
+ return Result.build(200, "鍙栨秷褰撳墠閽㈠寲澶辫触", result);
+ }
+ }
+
@ApiOperation("閽㈠寲/闈為挗鍖栨煡璇細0 闈為挗鍖� 1锛氶挗鍖�")
@PostMapping("/selectTemperingGlass")
public Result<List<TemperingGlassCountDTO>> selectTemperingGlass(int isTempering) {
@@ -186,5 +197,27 @@
String glassId = map.get("glassId");
return Result.build(200, "鎶ョ牬鎹熸垚鍔�", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId));
}
+
+ @ApiOperation("鏌ヨ宸ョ▼寰呮帓浜т俊鎭�")
+ @PostMapping("/queryEngineer") //鏄剧ず宸ョ▼鎺掍骇淇℃伅
+ @ResponseBody
+ public Result<List<BigStorageCageDetails>> queryEngineer() {
+ List<BigStorageCageDetails> result = bigStorageCageDetailsService.queryEngineer();
+ return Result.build(200, "", result);
+ }
+ @ApiOperation("鏌ヨ閽㈠寲鎺掍骇椤哄簭")
+ @PostMapping("/queryTemperingOrder") //鏄剧ず宸ョ▼鎺掍骇淇℃伅
+ @ResponseBody
+ public Result<List<OptimizeProject>> queryTemperingOrder() {
+ List<OptimizeProject> result = bigStorageCageDetailsService.queryTemperingOrder();
+ return Result.build(200, "", result);
+ }
+
+ @ApiOperation("锛堝垪琛級鎸夊垪琛ㄧ収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�")
+ @PostMapping("/queryVerticalSheetCageDetailsList")
+ public Result<List<BigCageDetailsVO>> queryVerticalSheetCageDetailsList(@RequestBody BigCageDetailsRequest request) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.queryVerticalSheetCageDetailsList(request));
+ }
+
}
--
Gitblit v1.8.0