From eaf25c57276ebaf28141418199c92e9502884ccf Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 09 三月 2025 23:51:28 +0800
Subject: [PATCH] 1、原片仓储新增任务完成/任务失败接口供用户异常情况恢复处理 2、原片仓储新增历史任务查询按钮 3、卧式理片新增任务完成/任务失败接口供用户异常情况恢复处理 4、大理片笼临时修改:10mm及以上厚度的玻璃走直通任务,厚度可按照实际情况进行配置 5、fixbug:中空理片笼10mm厚度玻璃进入理片笼小格子异常问题查询,同一个流程卡同一层出现2种厚度,导致厚度赋值异常,目前已改为查询最后一次导入的为准

---
 hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java |   53 ++++++++++++++++++-----------------------------------
 1 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
index 7b778e5..fb1e9cd 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java
@@ -1,61 +1,44 @@
 package com.mes.bigstorage.controller;
 
-
 import com.mes.bigstorage.entity.BigStorageCage;
-import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.BigStorageCageDetailsService;
+import com.mes.bigstorage.entity.dto.BigStorageAndDetailsDTO;
+import com.mes.bigstorage.entity.vo.BigStorageDetailsQueryVO;
 import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.utils.Result;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 /**
  * <p>
- *  鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
  * </p>
  *
  * @author zhoush
  * @since 2024-03-27
  */
+@Api(tags = "鐞嗙墖绗间俊鎭�")
 @RestController
 @RequestMapping("/bigStorageCage")
 public class BigStorageCageController {
 
+    @Autowired
     private BigStorageCageService bigStorageCageService;
-    private BigStorageCageDetailsService bigStorageCageDetailsService;
 
-    //todo: 瀹炰緥浠g爜 寰呭垹闄�
-    @ApiOperation("娴嬭瘯")
-    @GetMapping("/index")
-    public String index() {
-        return "hello world";
+    @ApiOperation("鐞嗙墖绗煎惎鐢ㄧ鐢�")
+    @GetMapping("/updateStorageCageDisabled")
+    public Result updateStorageCageDisabled(int slot, int enableState) {
+        bigStorageCageService.updateStorageCageDisabled(slot, enableState);
+        return Result.build(200, "鍚敤/绂佺敤鎴愬姛", 1);
     }
 
-    @ApiOperation("鐞嗙墖绗间俊鎭�")
-    @GetMapping("/BigStorageCage")
-    public List<BigStorageCage> BigStorageCage() {
-        return bigStorageCageService.list();
+    @ApiOperation("鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�")
+    @PostMapping("/querybigStorageCageDetail")
+    public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(@RequestBody BigStorageDetailsQueryVO query) {
+        return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageService.querybigStorageCageDetail(query));
     }
 
-    @ApiOperation("鐞嗙墖绗艰鎯�")
-    @GetMapping("/BigStorageCageDetails")
-    public List<BigStorageCageDetails> BigStorageCageDetails() {
-        return bigStorageCageDetailsService.list();
-    }
-
-    @ApiOperation("灏忚溅瀹炴椂浣嶇疆")
-    @GetMapping("/CarPosition")
-    public List<Integer> CarPosition() {
-        return bigStorageCageDetailsService.getCarposition();
-    }
-
-    @ApiOperation("鎵嬪姩瀹屾垚浠诲姟")
-    @GetMapping("/FinishTask")
-    public void FinishTask(int type, int id) {
-        //    bigStorageCageDetailsService.FinishTask();
-    }
 }

--
Gitblit v1.8.0