whycxzp
2025-05-09 862c0bb948a9fb8282bfacacb0cda165b28a29af
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修改后使用")
@@ -89,8 +90,8 @@
    @ApiOperation(value = "根据产品母料型号,定制单号,版本下载原始压缩包文件",notes = "11.17修改后使用")
    @GetMapping("getOriginalZip")
    public Response getOriginalZip( @RequestParam String parentModel,@RequestParam(required = false) String customCode,@RequestParam int version){
        return bomHistoryService.getOriginalZip(parentModel,customCode,version);
    public Response getOriginalZip(@RequestParam String parentCode, @RequestParam String parentModel,@RequestParam(required = false) String customCode,@RequestParam int version){
        return bomHistoryService.getOriginalZip(parentCode,parentModel,customCode,version);
    }
@@ -107,7 +108,7 @@
        return historyService.setpHistoryEnable(parentCode, customCode, version, enabled,reason,versionTime);
    }
    @PostMapping("zipParse")
    @ApiOperation(value = "zip解析",notes = "返回结果中,追加data3为对比结果,为key-value集合,key为diffList,addList,deleteList")
    @ApiOperation(value = "zip解析",notes = "返回结果中,追加data3为对比结果,为key-value集合,key为diffList,addList,deleteList,diffDwgList")
    public Response zipParse(@RequestParam("file") MultipartFile file,@RequestParam(required = false) String baseStr) throws IOException, InvalidFormatException {
        //要做对比的产品,传入了物料(parent_code)和定制表单号(custom_code)
        Product baseProduct = (baseStr==null?null:ActionUtil.getGson().fromJson(baseStr, Product.class));
@@ -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);
    }
}