Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-11-07 2abec00842a87162186406af7c2014aae948af49

 north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java

@@ -58,6 +58,13 @@
        return Result.success(glassOptimizeService.getProcessCardSv(projectNo));
    }

    @ApiOperation("工程信息查询接口")
    @PostMapping  ("/getProjectState/{projectNo}")
    public Result getProjectState(
            @PathVariable String projectNo){
        return Result.success(glassOptimizeService.getProjectState(projectNo));
    }

    //库存信息
    @ApiOperation("库存信息接口")
    @GetMapping  ("/materialStore/{thickness}/{model}/{projectNumber}")
@@ -123,11 +130,14 @@
            @PathVariable Integer states,
            @PathVariable Integer code
    ) throws JsonProcessingException {
        if (glassOptimizeService.updateProjectState(projectNumber, state,states,code)) {
            return Result.success();
        } else {
            throw new ServiceException(Constants.Code_500, "修改失败");

        try {
            if (glassOptimizeService.updateProjectState(projectNumber, state, states, code)) {
                return Result.success();
            } else {
                throw new ServiceException(Constants.Code_500, "修改失败");
            }
        } catch (Exception e) {
            return Result.error("201", e.getMessage());
        }
    }

@@ -484,6 +494,13 @@
    }


    @ApiOperation("mes工程生产不可见接口")
    @PostMapping("/issuingCancelProject")
    public Result issuingCancelProject(@RequestBody String projectNo){
        return Result.success(glassOptimizeService.issuingCancelProject(projectNo));
    }




}