From 80841103a1dccc2e251eb127264971266f06b19c Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 16 十二月 2024 11:22:50 +0800 Subject: [PATCH] 1、大理片笼格子存放顺序按照笼子存放的最大尺寸升序存放,避免厚度大的笼子进不去 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/controller/BigStorageCageDetailsController.java | 24 +++++++++++++++++++----- 1 files changed, 19 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 2f16a59..280a6bf 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 @@ -3,12 +3,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.mes.bigstorage.entity.BigStorageCageDetails; import com.mes.bigstorage.service.BigStorageCageDetailsService; import com.mes.bigstorage.service.BigStorageCageService; import com.mes.common.config.Const; -import com.mes.common.utils.RedisUtil; +import com.mes.utils.RedisUtil; import com.mes.utils.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,7 +29,7 @@ * @author zhoush * @since 2024-03-27 */ -@Api(description = "鐞嗙墖绗艰鎯�") +@Api(tags = "鐞嗙墖绗艰鎯�") @RestController @RequestMapping("/bigStorageCageDetails") public class BigStorageCageDetailsController { @@ -92,7 +91,8 @@ @ApiOperation("鎸囧畾閽㈠寲") @PostMapping("/TemperingGlass") public Result temperingGlass(@RequestBody BigStorageCageDetails bigStorageCageDetails) { - boolean result = bigStorageCageDetailsService.temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId()); + boolean result = bigStorageCageDetailsService + .temperingGlass(bigStorageCageDetails.getTemperingLayoutId().toString(), bigStorageCageDetails.getEngineerId(),bigStorageCageDetails.getTemperingFeedSequence().toString()); if (result == true) { return Result.build(200, "鎸囧畾閽㈠寲鎴愬姛", 1); } else { @@ -104,6 +104,13 @@ @PostMapping("/selectTemperingGlass") public Result selectTemperingGlass() { return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageDetailsService.selectTemperingGlass()); + } + + @ApiOperation("鏄惁璋冨害寮�鍏�") + @PostMapping("/dispatchSwitch") + public Result dispatchSwitch(Boolean flag) { + bigStorageCageDetailsService.dispatchSwitch(flag); + return Result.build(200, "淇敼鎴愬姛", redisUtil.getCacheObject("dispatchSwitch")); } @ApiOperation("鏄惁閽㈠寲寮�鍏�") @@ -145,7 +152,14 @@ }else{ return Result.build(200, "鎸囧畾娴佺▼鍗℃垚鍔�", 1); } - } + + @ApiOperation("鎸囧畾宸ョ▼") + @PostMapping("/appointEngineerId") + public Result appointEngineerId(@RequestBody BigStorageCageDetails bigStorageCageDetails) { + bigStorageCageDetailsService.appointEngineerId(bigStorageCageDetails.getEngineerId()); + return Result.build(200, "淇敼鎴愬姛", 1); + } + } -- Gitblit v1.8.0