Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

7 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java

@@ -38,7 +38,7 @@
    @SaCheckPermission("productStockList.search")
    @PostMapping("/getSelect/{pageNum}/{pageSize}")
    public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
        return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
        return Result.success(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
    }

    /*查询可入库的成品数据*/
@@ -46,7 +46,7 @@
    @SaCheckPermission("createProductStock.search")
    @PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
    public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
        return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
        return Result.success(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
    }

    /*成品入库*/
@@ -54,7 +54,7 @@
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
        return Result.success(finishedGoodsInventoryService.addSelectWarehousing(object));

    }

@@ -63,7 +63,7 @@
    @SaCheckPermission("finishedProductOut.search")
    @PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
    public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
        return Result.success(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
    }

    /*成品发货*/
@@ -71,7 +71,7 @@
    @SaCheckPermission("finishedProductOut.add")
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
        return Result.success(finishedGoodsInventoryService.addDeliveryDetail(object));
    }

    /* 调拨查询*/
@@ -79,7 +79,7 @@
    @SaCheckPermission("orderAllocation.search")
    @PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
    public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
        return Result.success(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
    }

    /*订单调拨*/
@@ -87,7 +87,7 @@
    @SaCheckPermission("orderAllocation.add")
    @PostMapping("/updateFinishedGoodsInventoryAllocate")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
    }

    /*调拨记录查询*/
@@ -95,7 +95,7 @@
    @SaCheckPermission("transferRecord.search")
    @PostMapping("/getSelectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    /*订单领出*/
@@ -103,7 +103,7 @@
    @SaCheckPermission("finishedGoodsIssue.add")
    @PostMapping("/updateFinishedGoodsInventoryTakeOut")
    public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
    }

    /*领出记录查询*/
@@ -111,14 +111,14 @@
    @SaCheckPermission("takeOutRecord.search")
    @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    /*订单返工*/
    @ApiOperation("订单返工查询接口")
    @PostMapping("/updateFinishedGoodsInventoryRework")
    public Result updateFinishedGoodsInventoryRework( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryRework(object));
    }


@@ -128,14 +128,14 @@
    @SaCheckPermission("takeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryToExamine")
    public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"审核"));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"审核"));
    }
    /*订单反审*/
    @ApiOperation("订单反审接口")
    @SaCheckPermission("takeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
    public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审"));
        return Result.success(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审"));
    }

    /*订单作废*/
@@ -143,7 +143,7 @@
    @SaCheckPermission("takeOutRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryToExamine")
    public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
        return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
    }

    /*出入库记录查询*/
@@ -151,7 +151,7 @@
    @SaCheckPermission("storageRecord.search")
    @PostMapping("/getSelectStorageRecord/{pageNum}/{pageSize}/{selectDate}/{type}")
    public Result getSelectStorageRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String type, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
    }

    /*出入库返回*/
@@ -159,14 +159,14 @@
    @SaCheckPermission("storageRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryStorage")
    public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
        return Result.success(finishedGoodsInventoryService.cancelFinishedGoodsInventoryStorage(object));
    }

    @ApiOperation("成品库存记录查询接口")
    @SaCheckPermission("warehouseReport.search")
    @PostMapping("/getSelectFinishedOperateLogReport/{type}/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedOperateLogReport(@PathVariable String type,@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(type,pageNum,pageSize,selectDate,finishedOperateLog));
    }

    @ApiOperation("成品报表导出")
@@ -182,7 +182,7 @@
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/oneClickStorage/{orderId}/{userName}")
    public Result oneClickStorage( @PathVariable String  orderId,@PathVariable String  userName){
        return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));
        return Result.success(finishedGoodsInventoryService.oneClickStorage(orderId,userName));

    }

@@ -191,7 +191,7 @@
    @SaCheckPermission("storageRecordPint.search")
    @PostMapping("/getSelectStorageRecordPint/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectStorageRecordPint(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecordPint(pageNum,pageSize,selectDate,finishedOperateLog));
        return Result.success(finishedGoodsInventoryService.getSelectStorageRecordPint(pageNum,pageSize,selectDate,finishedOperateLog));
    }

    /*装箱打印查询*/
@@ -199,7 +199,7 @@
    @SaCheckPermission("storageRecordPint.search")
    @PostMapping("/getSelectPrint")
    public Result getSelectPrint( @RequestBody Map<String, Object> object){
        return Result.seccess(finishedGoodsInventoryService.getSelectPrintSv(object));
        return Result.success(finishedGoodsInventoryService.getSelectPrintSv(object));
    }

    /*装箱打印查询*/
@@ -207,14 +207,21 @@
    @SaCheckPermission("storageRecordPint.search")
    @PostMapping("/getSelectPrints")
    public Result getSelectPrints( @RequestBody Map<String, Object> object){
        return Result.seccess(finishedGoodsInventoryService.getSelectPrintSvs(object));
        return Result.success(finishedGoodsInventoryService.getSelectPrintSvs(object));
    }
    /*装箱打印查询*/
    @ApiOperation("库存装箱打印内容查询接口")
    @SaCheckPermission("createProductStock.search")
    @PostMapping("/getInventoryPrints")
    public Result getInventoryPrints( @RequestBody List<FinishedGoodsInventory> finishedGoodsInventories){
        return Result.success(finishedGoodsInventoryService.getInventoryPrints(finishedGoodsInventories));
    }

    @ApiOperation("成品装箱调架")
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/changeRack/{user}")
    public Result changeRack( @RequestBody FinishedGoodsInventory  finishedGoodsInventory,@PathVariable String user){
        return Result.seccess(finishedGoodsInventoryService.changeRack(finishedGoodsInventory,user));
        return Result.success(finishedGoodsInventoryService.changeRack(finishedGoodsInventory,user));

    }
}