diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java index cb633c2a8..b7168c8a6 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java @@ -403,15 +403,15 @@ public class WarehouseUpdownTypeApiController { public R downZeroOrder(@RequestBody UpdownTypeDTO updownTypeDTO ) { String method = "###########downZeroOrder: "; log.info(method + "下架零担 updownTypeDTO={}", updownTypeDTO); - List upShelfPackageList = updownTypeDTO.getUpShelfZeroOrderList(); + List upShelfZeroOrderList = updownTypeDTO.getUpShelfZeroOrderList(); try{ - int size = upShelfPackageList.size(); + int size = upShelfZeroOrderList.size(); if(size == 0 ){ log.warn(method+"没有处理的数据"); return R.fail(403,"无处理数据"); } //查询该库位的货物信息 - return warehouseUpdownTypeService.downZeroOrder(upShelfPackageList); + return warehouseUpdownTypeService.downZeroOrder(upShelfZeroOrderList); }catch (CustomerException e){ log.warn(e.message); return R.fail(e.code,e.message); @@ -645,10 +645,10 @@ public class WarehouseUpdownTypeApiController { @ResponseBody @PostMapping("/moveAllocationByTrayCode") @ApiOperationSupport(order = 1) - @ApiOperation(value = "移库通过托盘", notes = "传入trayTypeDTO") + @ApiOperation(value = "移库托盘", notes = "传入trayTypeDTO") public R moveAllocationByTrayCode(@RequestBody UpdownTypeDTO updownTypeDTO) { String method = "###########moveAllocationByTrayCode: "; - log.info(method + "移库通过托盘 updownTypeDTO={}", updownTypeDTO); + log.info(method + "移库托盘 updownTypeDTO={}", updownTypeDTO); String trayCode = updownTypeDTO.getTrayCode(); Long allocationId = updownTypeDTO.getAllocationId(); try{ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java index 1bbc620bb..7e63127fc 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java @@ -1058,7 +1058,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl