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/workstation/controller/UpWorkstationController.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
index 57b043d..de9796e 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -2,8 +2,6 @@
import com.mes.utils.Result;
-import com.mes.workstation.entity.GlassInfo;
-import com.mes.workstation.entity.UpWorkSequence;
import com.mes.workstation.entity.UpWorkstation;
import com.mes.workstation.service.UpWorkstationService;
import io.swagger.annotations.ApiOperation;
@@ -29,6 +27,7 @@
private UpWorkstationService upWorkstationService;
@ApiOperation("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅")
@GetMapping("/list") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
+ @ResponseBody
public Result<List<UpWorkstation>> list() {
List<UpWorkstation> glass = upWorkstationService.list();
log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass);
@@ -40,17 +39,25 @@
@ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�,浼犻�扷pworkstation绫�,鍙慨鏀瑰楂樺帤鏁伴噺鑶滅郴")
@PostMapping("/updateGlassMessage")
@ResponseBody
- public Result<UpWorkstation> updateGlassMessage(@RequestBody UpWorkstation upwork) {
- upWorkstationService.updateGlassMessage(upwork);
- return Result.build(200, "", upwork);
+ public Result<List<UpWorkstation>> updateGlassMessage(@RequestBody UpWorkstation upwork) {
+ Boolean info= upWorkstationService.updateGlassMessage(upwork);
+ List<UpWorkstation> glass = upWorkstationService.list();
+ if(info){
+ return Result.build(200, "鎴愬姛", glass);
+ }else{
+ return Result.build(100, "澶辫触", glass);
+ }
+
}
- @ApiOperation("寮�濮嬩笂鐗囦换鍔�")
- @PostMapping("/selectPriority") //璋冪敤涓婄墖浠诲姟
+
+
+ @ApiOperation("淇敼涓婄墖mes鑱斿姩璇锋眰瀛�")
+ @PostMapping("/updateMesInkageLoad")
@ResponseBody
- public void selectPriority() {
- UpWorkSequence work=upWorkstationService.selectPriority();
- log.info("鏄剧ず鍙笂鐨勭幓鐠冧俊鎭�:{}", work);
+ public Result<String> updateMesInkageLoad(@RequestBody short inKageWord) {
+ String result = upWorkstationService.updateMesInkageLoad(inKageWord);
+ return Result.success(result);
}
--
Gitblit v1.8.0