Merge remote-tracking branch 'origin/master'

zhoushihao

2025-05-12 fbd31387721424c65b173cbb23b03202f3e7dce6

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

    }

}