From d9d502b669dcbfc8e3aed10014aa99930979cd7a Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 11 三月 2025 09:50:47 +0800 Subject: [PATCH] 1、大理片笼新增复位按钮:清除笼内状态为0的玻璃数据,并将格子尺寸恢复到初始状态。 2、历史任务按钮:按照查询条件查询理片笼信息历史任务 3、fixbug:卧式理片笼没有玻璃时,仅恢复格子的尺寸 4、fixbug:中空出片顺序错乱,当数量小于总层数时,增加是否同一对玻璃的判断,避免少于总层数出片玻璃不是一对情况的发生 5、向前端推送上片的工位信息 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageController.java | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 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 a81873e..f10dcd7 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,14 +1,13 @@ package com.mes.bigstorage.controller; -import com.mes.bigstorage.entity.BigStorageCage; +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.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -20,7 +19,7 @@ * @author zhoush * @since 2024-03-27 */ -@Api(description = "鐞嗙墖绗间俊鎭�") +@Api(tags = "鐞嗙墖绗间俊鎭�") @RestController @RequestMapping("/bigStorageCage") public class BigStorageCageController { @@ -28,10 +27,23 @@ @Autowired private BigStorageCageService bigStorageCageService; - @ApiOperation("鏌ヨ鐞嗙墖绗间俊鎭�") - @GetMapping("/bigStorageCage") - public Result querybigStorageCageDetail() { - return Result.build(200,"鏌ヨ鎴愬姛",bigStorageCageService.querybigStorageCageDetail()); + @ApiOperation("鐞嗙墖绗煎惎鐢ㄧ鐢�") + @GetMapping("/updateStorageCageDisabled") + public Result updateStorageCageDisabled(int slot, int enableState) { + bigStorageCageService.updateStorageCageDisabled(slot, enableState); + return Result.build(200, "鍚敤/绂佺敤鎴愬姛", 1); } + @ApiOperation("鎸夌収鏌ヨ鏉′欢锛堣澶噄d銆佹祦绋嬪崱銆佽啘绯伙級鑾峰彇璁惧瀵瑰簲鐨勭瀛愮幓鐠冧俊鎭�") + @PostMapping("/querybigStorageCageDetail") + public Result<List<BigStorageAndDetailsDTO>> querybigStorageCageDetail(@RequestBody BigStorageDetailsQueryVO query) { + return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageService.querybigStorageCageDetail(query)); + } + @ApiOperation("澶嶄綅锛氶噸缃悊鐗囩鍩虹淇℃伅1娓呴櫎绗煎唴鐘舵�佷负0鐨勮剰鏁版嵁銆�2灏嗙┖鏍煎瓙鐨勫昂瀵哥疆涓哄垵濮嬪昂瀵�") + @PostMapping("/resetCage") + public Result<Boolean> resetCage() { + return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageService.resetCage()); + } + + } -- Gitblit v1.8.0