Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

2 天以前 f05fd2a067d751333f00a81dad095a7650900c95

 src/main/java/com/ruoyi/production/controller/ProductMaterialController.java

@@ -43,10 +43,18 @@
    }

    @GetMapping("/list")
    @ApiOperation("物料数据")
    @Log(title = "物料数据", businessType = BusinessType.OTHER)
    public AjaxResult productMaterialList(String materialName) {
        List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList(materialName);
    @ApiOperation("物料数据类别数据集合")
    @Log(title = "物料数据类别数据集合", businessType = BusinessType.OTHER)
    public AjaxResult productMaterialList(@RequestParam("type") Integer type) {
        List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.ProductMaterialList(type);
        return AjaxResult.success(productMaterialMap);
    }

    @GetMapping("/listQuery")
    @ApiOperation("物料数据类别子类数据集合")
    @Log(title = "物料数据类别子类数据集合", businessType = BusinessType.OTHER)
    public AjaxResult productMaterialListByQuery(@RequestParam(value = "materialName", required = false) String materialName, @RequestParam(value = "materialTypeId", required = false) Integer materialTypeId) {
        List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.productMaterialListByQuery(materialName, materialTypeId);
        return AjaxResult.success(productMaterialMap);
    }