Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

严智鑫

2024-05-17 7b89e2cf25b6d5a43ecc86bb64a6a245ae862c6e

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java

@@ -29,6 +29,7 @@
    private UpWorkstationService upWorkstationService;
    @ApiOperation("显示工位上的玻璃信息")
    @GetMapping("/list") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<List<UpWorkstation>> list() {
        List<UpWorkstation> glass = upWorkstationService.list();
        log.info("显示工位上的玻璃信息:{}", glass);
@@ -45,14 +46,14 @@
        return Result.build(200, "", upwork);
    }

    @ApiOperation("开始上片任务")
    @PostMapping("/selectPriority") //调用上片任务
    @ResponseBody
    public void selectPriority() {
        UpWorkSequence work=upWorkstationService.selectPriority();
        log.info("显示可上的玻璃信息:{}", work);

    }
//    @ApiOperation("开始上片任务")
//    @PostMapping("/selectPriority") //调用上片任务
//    @ResponseBody
//    public void selectPriority() {
//        UpWorkSequence work=upWorkstationService.selectPriority();
//        log.info("显示可上的玻璃信息:{}", work);
//
//    }

}