Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2023-10-20 7256cfae5c075ee4b353a96d864963373e05946c

 src/main/java/com/whyc/controller/ProductController.java

@@ -47,9 +47,10 @@
                                  @RequestParam(required = false) String parentName,
                                  @RequestParam(required = false) String parentModel,
                                  @RequestParam(required = false) String customCode,
                                  @RequestParam(required = false) Integer enabled,
                                  @RequestParam int pageCurr,
                                  @RequestParam int pageSize){
        return service.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,pageCurr,pageSize);
        return service.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,enabled,pageCurr,pageSize);
    }

    @ApiOperation(value = "查询出所有的产品无参不分页（产品上传的是用）",notes = "9.2修改后使用")
@@ -152,4 +153,10 @@
    public Response getCompareProduct(){
        return service.getCompareProduct();
    }

    @ApiOperation(value = "验证母料编码是否存在产品中")
    @GetMapping("judgeParentCode")
    public Response judgeParentCode(@RequestParam String parentCode,@RequestParam(required = false) String customCode){
        return service.judgeParentCode(parentCode,customCode);
    }
}