From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 六月 2024 16:38:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 f1907fe..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
@@ -40,9 +40,14 @@
@PostMapping("/updateGlassMessage")
@ResponseBody
public Result<List<UpWorkstation>> updateGlassMessage(@RequestBody UpWorkstation upwork) {
- upWorkstationService.updateGlassMessage(upwork);
+ Boolean info= upWorkstationService.updateGlassMessage(upwork);
List<UpWorkstation> glass = upWorkstationService.list();
- return Result.build(200, "", glass);
+ if(info){
+ return Result.build(200, "鎴愬姛", glass);
+ }else{
+ return Result.build(100, "澶辫触", glass);
+ }
+
}
@@ -53,6 +58,7 @@
public Result<String> updateMesInkageLoad(@RequestBody short inKageWord) {
String result = upWorkstationService.updateMesInkageLoad(inKageWord);
return Result.success(result);
+
}
}
--
Gitblit v1.8.0