From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 08 八月 2024 10:14:59 +0800 Subject: [PATCH] 1、任务表中新增是否删除字段 0:未删除 1:已删除 2、磨边队列方法改造:增加设置参数接口,websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善 --- 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