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/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 6ea664c..3d98ea2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -2,6 +2,7 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -35,8 +36,6 @@
private EngineeringService engineeringService;
@Autowired
private OptimizeProjectService optimizeProjectService;
-
-
@ApiOperation("鏄剧ず閫夋嫨鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
@@ -50,19 +49,17 @@
@PostMapping("/selectUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
- List<UpPattenUsage> upPattenUsages = null;
+ List<UpPattenUsage> upPattenUsages=null;
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
- if (upPattenUsage == null) {
-// return Result.build(200, "澶辫触鏃犳暟鎹�", null);
-// upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
+ if(upPattenUsage == null){
upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
- } else {
- upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);
+ }else {
+ upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
}
if (!upPattenUsages.isEmpty()) {
return Result.build(200, "鎴愬姛", upPattenUsages);
- } else {
+ }else {
return Result.build(100, "澶辫触", upPattenUsages);
}
@@ -73,19 +70,13 @@
@ResponseBody
public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
- if (whether) {
+ if (whether){
return Result.build(200, "鎴愬姛", whether);
- } else {
+ }else {
return Result.build(100, "澶辫触", whether);
}
}
- @ApiOperation("璁剧疆涓婄墖鏌ヨ鏉′欢")
- @PostMapping("/setUpPattenRequest")
- public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
- log.info("鏌ヨ涓婄墖淇℃伅:{}", request);
- return Result.build(200, "鏌ヨ鎴愬姛", upPattenUsageService.setRawGlassTaskRequest(request));
- }
}
--
Gitblit v1.8.0