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/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java index ae4a15f..cf952c6 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java @@ -1,9 +1,13 @@ package com.mes.downglassinfo.controller; -import io.swagger.annotations.Api; +import com.mes.downglassinfo.service.DownGlassInfoService; +import com.mes.downstorage.entity.DownStorageCageDetails; +import com.mes.utils.Result; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,16 +19,19 @@ * @author zhoush * @since 2024-04-07 */ -@Api(tags = "涓嬫枡浠诲姟") + @RestController @RequestMapping("/downGlassTask") public class DownGlassTaskController { - //todo: 瀹炰緥浠g爜 寰呭垹闄� - @ApiOperation("娴嬭瘯") - @GetMapping("/index") - public String index() { - return "hello world"; + @Autowired + DownGlassInfoService downGlassInfoService; + + @PostMapping("/generateOutGlassTask") + @ApiOperation(value = "鐢熸垚鍑虹墖浠诲姟", notes = "鐢熸垚鍑虹墖浠诲姟") + public Result<Boolean> generateOutGlassTask(@RequestBody DownStorageCageDetails downStorageCageDetails) { + return Result.success(downGlassInfoService.generateOutGlassTask(downStorageCageDetails.getGlassId())); } + } -- Gitblit v1.8.0