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

严智鑫

2024-06-14 6977fb42d5067f6c938ef3de559a6ad19b542a0b

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -36,7 +36,7 @@
    private  EngineeringService engineeringService;
    @Autowired
    private OptimizeProjectService optimizeProjectService;
    @ApiOperation("显示正在出片的工程信息")
    @ApiOperation("显示选择的工程信息")
    @GetMapping("/prioritylist") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<List<UpPattenUsage>> prioritylist() {
@@ -49,10 +49,34 @@
    @PostMapping("/selectUpPattenUsage") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
        List<UpPattenUsage> upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
        return Result.build(200, "", upPattenUsages);
        List<UpPattenUsage> upPattenUsages=null;
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        if(upPattenUsage == null){
            upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
        }else {
            upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
        }

        if (!upPattenUsages.isEmpty()) {
            return Result.build(200, "成功", upPattenUsages);
        }else {
            return Result.build(100, "失败", upPattenUsages);
        }

        }

    @ApiOperation("切换原片上片状态")
    @PostMapping("/updateGlassState") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
        Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
        if (whether){
            return Result.build(200, "成功", whether);
        }else {
            return Result.build(100, "失败", whether);
        }

    }

}