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/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragetask/controller/BigStorageCageOutTaskController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 2c76b1f..e770855 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,12 +1,16 @@
package com.mes.bigstoragetask.controller;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.tomcat.util.bcel.Const;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -14,7 +18,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -27,13 +31,34 @@
@Autowired
private BigStorageCageOutTaskService bigStorageCageOutTaskService;
+ @Autowired
+ private TemperingGlassInfoService temperingGlassInfoService;
@ApiOperation("鍑虹墖浠诲姟淇敼")
@PostMapping("/updatebigStorageCageOutTask")
public Result deleteBigStorageCageDetails(@RequestBody BigStorageCageOutTask bigStorageCageOutTask) {
+ if (bigStorageCageOutTask.getTaskState() > 3) {
+ temperingGlassInfoService.remove(
+ new LambdaUpdateWrapper<TemperingGlassInfo>()
+ .in(TemperingGlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
+ );
+ } else {
+ temperingGlassInfoService.update(
+ new LambdaUpdateWrapper<TemperingGlassInfo>()
+ .in(TemperingGlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
+ .set(TemperingGlassInfo::getState, 0)
+ );
+ }
bigStorageCageOutTaskService.updateById(bigStorageCageOutTask);
return Result.build(200, "淇敼鎴愬姛", 1);
}
+ @ApiOperation("鍑虹墖浠诲姟鎶ヨ〃")
+ @PostMapping("/selectBigStorageCageOutTask")
+ public Result selectBigStorageCageOutTask(@RequestBody BigStorageCageOutTask bigStorageCageOutTask,
+ @RequestParam(required = false) String startTime,
+ @RequestParam(required = false) String endTime) {
+ return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageOutTaskService.selectBigStorageCageOutTask(bigStorageCageOutTask, startTime, endTime));
+ }
}
--
Gitblit v1.8.0