From f68d3c71819feb59e7a227a5d992b059b900916c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 28 三月 2025 08:28:26 +0800
Subject: [PATCH] 修改报表，界面添加查询流程卡个数，调整推送数据到前端的间隔
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/controller/DownGlassTaskController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 10 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..9935139 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,11 +1,19 @@
package com.mes.downglassinfo.controller;
-import io.swagger.annotations.Api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.mes.downglassinfo.entity.DownGlassTask;
+import com.mes.downglassinfo.service.DownGlassInfoService;
+import com.mes.downglassinfo.service.DownGlassTaskService;
+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.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -15,16 +23,42 @@
* @author zhoush
* @since 2024-04-07
*/
-@Api(tags = "涓嬫枡浠诲姟")
+
@RestController
@RequestMapping("/downGlassTask")
public class DownGlassTaskController {
- //todo: 瀹炰緥浠ｇ爜 寰呭垹闄�
- @ApiOperation("娴嬭瘯")
- @GetMapping("/index")
- public String index() {
- return "hello world";
+ @Resource
+ DownGlassInfoService downGlassInfoService;
+
+ @Resource
+ DownGlassTaskService downGlassTaskService;
+
+ @PostMapping("/generateOutGlassTask")
+ @ApiOperation(value = "鐢熸垚鍑虹墖浠诲姟", notes = "鐢熸垚鍑虹墖浠诲姟")
+ public Result<Boolean> generateOutGlassTask(@RequestBody DownStorageCageDetails downStorageCageDetails) {
+ return Result.success(downGlassInfoService.generateOutGlassTask(downStorageCageDetails.getGlassId()));
+ }
+
+ @PostMapping("/updateOutGlassTask")
+ @ApiOperation(value = "娓呯┖鐜荤拑", notes = "娓呯┖鐜荤拑")
+ public Result<Boolean> updateOutGlassTask() {
+ downGlassTaskService.update(
+ new LambdaUpdateWrapper<DownGlassTask>()
+ .set(DownGlassTask::getTaskStatus, 3)
+ .eq(DownGlassTask::getEndCell, 7)
+ .eq(DownGlassTask::getTaskType, 3)
+ .lt(DownGlassTask::getTaskStatus, 3)
+ );
+ return Result.build(200, "娓呯┖鎴愬姛", true);
+ }
+
+ @ApiOperation("鍗х悊浠诲姟鎶ヨ〃")
+ @PostMapping("/selectDownGlassTask")
+ public Result selectDownGlassTask(@RequestBody DownGlassTask downGlassTask,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime) {
+ return Result.build(200, "鏌ヨ鎴愬姛", downGlassTaskService.selectDownGlassTask(downGlassTask, startTime, endTime));
}
}
--
Gitblit v1.8.0