From 2f367eea0033c59e3739c6821e86b3a34af49ebb Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 六月 2024 08:27:42 +0800
Subject: [PATCH] fixbug:玻璃种类过多导致机系统异常

---
 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