产品bom对比升级

whycxzp

2022-10-18 9d7ac939e4a1653aaa3a457235dc7b5d88361a0f

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

@@ -42,9 +42,14 @@

    @ApiOperation(value = "查询出所有的产品信息(分页加模糊查询<产品的编码，型号，名字，定制表编号>)",notes = "8.17修改后使用")
    @GetMapping("getAllProduct")
    public Response getAllProduct(@RequestParam(required = false) String parentCode,@RequestParam(required = false) String parentName, @RequestParam(required = false) String parentModel
            ,  @RequestParam(required = false) String customCode, @RequestParam int pageCurr, @RequestParam int pageSize){
        return service.getAllProduct(parentCode,parentName,parentModel,customCode,pageCurr,pageSize);
    public Response getAllProduct(@RequestParam(required = false) String subCode,
                                  @RequestParam(required = false) String parentCode,
                                  @RequestParam(required = false) String parentName,
                                  @RequestParam(required = false) String parentModel,
                                  @RequestParam(required = false) String customCode,
                                  @RequestParam int pageCurr,
                                  @RequestParam int pageSize){
        return service.getAllProduct(subCode,parentCode,parentName,parentModel,customCode,pageCurr,pageSize);
    }

    @ApiOperation(value = "查询出所有的产品无参不分页（产品上传的是用）",notes = "9.2修改后使用")
@@ -74,6 +79,8 @@
    public Response getBomHistoryAndMaterial( @RequestParam int productId, @RequestParam int version){
        return bomHistoryService.getBomHistoryAndMaterial(productId,version);
    }


    @ApiOperation(value = "历史产品下载(产品id和版本<下载的版本>)",notes = "8.17修改后使用")
    @GetMapping("downloadProductHistory")
    public void downloadProductHistory(HttpServletRequest req, HttpServletResponse resp, @RequestParam int productId, @RequestParam int version){
@@ -82,8 +89,8 @@

    @ApiOperation(value = "历史版本可用性设定",notes = "8.31修改后使用")
    @GetMapping("setpHistoryEnable")
    public Response setpHistoryEnable( @RequestParam String parentCode, @RequestParam String customCode, @RequestParam int version,@RequestParam int enabled) {
        return historyService.setpHistoryEnable(parentCode, customCode, version, enabled);
    public Response setpHistoryEnable( @RequestParam String parentCode, @RequestParam String customCode, @RequestParam int version,@RequestParam int enabled,@RequestParam(required = false) String reason,@RequestParam String versionTime) {
        return historyService.setpHistoryEnable(parentCode, customCode, version, enabled,reason,versionTime);
    }
    @PostMapping("zipParse")
    @ApiOperation(value = "zip解析",notes = "返回结果中,追加data3为对比结果,为key-value集合,key为diffList,addList,deleteList")
@@ -98,4 +105,19 @@
    public Response add(@RequestBody Product product) throws IOException {
        return service.add(product);
    }

    @ApiOperation(value = "根据产品id查询被锁定的物料dwg和产品丝印",notes = "8.17修改后使用")
    @GetMapping("getLockedByProductId")
    public Response getLockedByProductId( @RequestParam int productId){
        return service.getLockedByProductId(productId);
    }

    /*@GetMapping("manualUpdate")
    @Transactional
    public void manualUpdate(){
        //material属性转移到bom和bomHistory
        bomHistoryService.updateMaterialField2BomHistory();
        bomService.updateMaterialField2Bom();
    }*/

}