From b21caa5499c50384f3a3a5dd795a7a0ad197d36f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 06 十一月 2025 21:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java |   70 +++++++++++++++++++++++++++++-----
 1 files changed, 59 insertions(+), 11 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 5ff1a1b..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,20 +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.glassinfo.entity.GlassInfo;
+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;
@@ -71,7 +70,7 @@
         return Result.build(200, "鍒犻櫎鎴愬姛", bigStorageCageService.querybigStorageCageDetail());
     }
 
-    @ApiOperation("鐞嗙墖绗间换鍔＄牬鎹�0/鎷胯蛋1")
+    @ApiOperation("鐞嗙墖绗肩鍐呯幓鐠冪牬鎹�0/鎷胯蛋1")
     @PostMapping("/damageBigStorageCageDetails")
     public Result damageBigStorageCageDetails(@RequestBody BigStorageCageDetails bigStorageCageDetails, int status) {
         bigStorageCageDetailsService.damageBigStorageCageDetails(bigStorageCageDetails.getGlassId(), status);
@@ -104,10 +103,38 @@
         }
     }
 
+    @ApiOperation("鎸囧畾閽㈠寲宸ョ▼")
+    @PostMapping("/appointTemperingEngineerId")
+    public Result appointTemperingEngineerId(String engineerId) {
+        boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(engineerId);
+        if (result == true) {
+            return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1);
+        } else {
+            return Result.build(200, "宸插瓨鍦ㄩ挗鍖栦换鍔★紝璇风瓑寰呴挗鍖栧畬鎴愬啀鎸囧畾閽㈠寲", 1);
+        }
+    }
+
+    @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) {
         return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass(isTempering));
+    }
+
+    @ApiOperation("绗煎唴瀹為檯鏁伴噺鏌ヨ")
+    @PostMapping("/queryRealGlassInfo")
+    public Result<List<BigStorageCageDetails>> queryRealGlassInfo(@RequestBody BigStorageQueryVO bigStorageQueryVO) {
+        return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.queryRealGlassInfo(bigStorageQueryVO));
     }
 
     @ApiOperation("缂虹墖鏁伴噺鏌ヨ")
@@ -164,11 +191,32 @@
         }
     }
 
-    @ApiOperation("鎸囧畾宸ョ▼")
-    @PostMapping("/appointEngineerId")
-    public Result appointEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) {
-        bigStorageCageDetailsService.appointEngineerId(bigStorageCageDetails.getEngineerId());
-        return Result.build(200, "淇敼鎴愬姛", 1);
+    @ApiOperation("澶х悊鐗囩鎶ョ牬鎹�")
+    @PostMapping("/bigStorageGlassDamageByGlassId")
+    public Result<String> bigStorageGlassDamageByGlassId(@RequestBody Map<String, String> map) {
+        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