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

guoyujie

2025-04-27 6dbea727a1fcaa0de63578ac90183bfd0a1417b3

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

@@ -49,11 +49,12 @@

    //库存信息
    @ApiOperation("库存信息接口")
    @PostMapping  ("/materialStore/{thickness}/{model}/{projectNumber}")
    @GetMapping  ("/materialStore/{thickness}/{model}/{projectNumber}")
    public Result materialStore(
            @PathVariable  String thickness,
            @PathVariable  String model,@PathVariable  String projectNumber ){
        return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber));
            @PathVariable  String model,@PathVariable  String projectNumber,
            @RequestParam(name = "type", required = false) Integer type ){
        return Result.seccess(glassOptimizeService.materialStoreSv(thickness,model,projectNumber,type));
    }


@@ -280,6 +281,12 @@
        return Result.seccess(glassOptimizeService.saveConfiguration(object,type));
    }

    @ApiOperation("模拟排版")
    @PostMapping("/simulatedTypesetting")
    public Result simulatedTypesetting(@RequestBody Map<String, Object> object) {
        return Result.seccess(glassOptimizeService.simulatedTypesetting1(object));
    }



}