验收报告添加信息

whyclxw

3 天以前 bfa320956f20988fe671b0c4d25aa82fe766a98d

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

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


@@ -108,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));