From 416ec0563f02d3d5b84f9b1d36bb11afdec721ec Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 05 六月 2024 15:10:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 14 ++++----------
1 files changed, 4 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 f770a89..257bc80 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
@@ -39,19 +39,12 @@
@ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�,浼犻�扷pworkstation绫�,鍙慨鏀瑰楂樺帤鏁伴噺鑶滅郴")
@PostMapping("/updateGlassMessage")
@ResponseBody
- public Result<UpWorkstation> updateGlassMessage(@RequestBody UpWorkstation upwork) {
+ public Result<List<UpWorkstation>> updateGlassMessage(@RequestBody UpWorkstation upwork) {
upWorkstationService.updateGlassMessage(upwork);
- return Result.build(200, "", upwork);
+ List<UpWorkstation> glass = upWorkstationService.list();
+ return Result.build(200, "", glass);
}
-// @ApiOperation("寮�濮嬩笂鐗囦换鍔�")
-// @PostMapping("/selectPriority") //璋冪敤涓婄墖浠诲姟
-// @ResponseBody
-// public void selectPriority() {
-// UpWorkSequence work=upWorkstationService.selectPriority();
-// log.info("鏄剧ず鍙笂鐨勭幓鐠冧俊鎭�:{}", work);
-//
-// }
@ApiOperation("淇敼涓婄墖mes鑱斿姩璇锋眰瀛�")
@@ -60,6 +53,7 @@
public Result<String> updateMesInkageLoad(@RequestBody short inKageWord) {
String result = upWorkstationService.updateMesInkageLoad(inKageWord);
return Result.success(result);
+
}
}
--
Gitblit v1.8.0