From 65ae6084f552c035eb5640afbd8f73e6054e3b6c Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 16 七月 2024 21:15:53 +0800 Subject: [PATCH] 1、大理片:fixbug:大理片出片逻辑修改,钢化版图是否到齐:sql逻辑问题,包含人工出片任务,造成钢化版图是否到齐需要获取已出片的玻璃,造成已出笼的玻璃会重复计算并准备生成钢化任务,但获取的玻璃信息为空,造成插入钢化表异常。且排除已出笼的钢化版图较复杂(暂不关联钢化小片表),目前解决方案:把所有到齐的钢化版图数据查出来,排除笼内玻璃为空的 2、移除已配置完mapperscan已扫描仍有@Mapper注解的 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java index e6d5946..cd4e8db 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java @@ -1,41 +1,37 @@ package com.mes.userinfo.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.mes.bigstorage.entity.BigStorageCage; import com.mes.bigstoragetask.entity.BigStorageCageOutTask; import com.mes.bigstoragetask.service.BigStorageCageOutTaskService; -import io.swagger.annotations.ApiModel; +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 java.util.List; /** * <p> - * 鍓嶇鎺у埗鍣� + * 鍓嶇鎺у埗鍣� * </p> * * @author zhoush * @since 2024-04-16 */ -@ApiModel("鍑虹墖浠诲姟淇℃伅") +@Api(description = "鍑虹墖浠诲姟淇℃伅") @RestController -@RequestMapping("/userinfo/big-storage-cage-out-task") +@RequestMapping("/big-storage-cage-out-task") public class BigStorageCageOutTaskController { @Autowired private BigStorageCageOutTaskService bigStorageCageOutTaskService; - - @ApiOperation("杩涚墖浠诲姟淇℃伅") - @GetMapping("/querybigStorageCageTask") - public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState) { - return bigStorageCageOutTaskService.querybigStorageCageOutTask(taskState); - } +// @ApiOperation("鍑虹墖浠诲姟淇℃伅") +// @GetMapping("/querybigStorageCageOutTask") +// public List<BigStorageCageOutTask> querybigStorageCageOutTask(int taskState) { +// return bigStorageCageOutTaskService.querybigStorageCageOutTask(taskState); +// } } -- Gitblit v1.8.0