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

chenlu

2025-11-19 260ad701e251aaa71a1bf5531bd98d93cb91c2bf

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

@@ -130,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());
        }
    }

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


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




}