From 02ebc36f541d1ff39bdd4e9a65672ab58e84c5d8 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 17 三月 2025 15:17:38 +0800 Subject: [PATCH] 1、中空定时任务优化 2、中空理片笼/大理片笼详情界面由按笼子显示改为全部显示(厂长提出) --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 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 cffa40b..ee87a6f 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 @@ -10,7 +10,6 @@ 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.utils.RedisUtil; import com.mes.utils.Result; import io.swagger.annotations.Api; @@ -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); @@ -106,8 +105,8 @@ @ApiOperation("鎸囧畾閽㈠寲宸ョ▼") @PostMapping("/appointTemperingEngineerId") - public Result appointTemperingEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) { - boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(bigStorageCageDetails.getEngineerId()); + public Result appointTemperingEngineerId(String engineerId) { + boolean result = bigStorageCageDetailsService.appointTemperingEngineerId(engineerId); if (result == true) { return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1); } else { @@ -119,6 +118,12 @@ @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("缂虹墖鏁伴噺鏌ヨ") @@ -174,9 +179,11 @@ return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1); } } + @ApiOperation("澶х悊鐗囩鎶ョ牬鎹�") @PostMapping("/bigStorageGlassDamageByGlassId") - public Result<String> bigStorageGlassDamageByGlassId(String glassId) { + public Result<String> bigStorageGlassDamageByGlassId(@RequestBody Map<String, String> map) { + String glassId = map.get("glassId"); return Result.build(200, "鎶ョ牬鎹熸垚鍔�", bigStorageCageDetailsService.bigStorageGlassDamageByGlassId(glassId)); } } -- Gitblit v1.8.0