|
|
@ -55,7 +55,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { |
|
|
|
dto.setOrderPackageCode(orderPackageCode); |
|
|
|
dto.setOrderPackageCode(orderPackageCode); |
|
|
|
upShelfPackageList.add(dto); |
|
|
|
upShelfPackageList.add(dto); |
|
|
|
} |
|
|
|
} |
|
|
|
if(upShelfPackageList.size() > 0){ |
|
|
|
if(!upShelfPackageList.isEmpty()){ |
|
|
|
return warehouseUpdownTypeService.downPackage(upShelfPackageList,warehouseId,remark); |
|
|
|
return warehouseUpdownTypeService.downPackage(upShelfPackageList,warehouseId,remark); |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
return R.fail(403,"处理失败"); |
|
|
|
return R.fail(403,"处理失败"); |
|
|
@ -66,14 +66,14 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { |
|
|
|
public R downDeliveryPackage(Map<String,Object> map) { |
|
|
|
public R downDeliveryPackage(Map<String,Object> map) { |
|
|
|
List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>(); |
|
|
|
List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>(); |
|
|
|
String orderPackageCodes = (String) map.get("orderPackageCode"); |
|
|
|
String orderPackageCodes = (String) map.get("orderPackageCode"); |
|
|
|
String warehouseId = (String) map.get("warehouseId"); |
|
|
|
String warehouseId = String.valueOf(map.get("warehouseId")); |
|
|
|
String[] split = orderPackageCodes.split(","); |
|
|
|
String[] split = orderPackageCodes.split(","); |
|
|
|
for(String orderPackageCode:split){ |
|
|
|
for(String orderPackageCode:split){ |
|
|
|
UpShelfPackageDTO dto = new UpShelfPackageDTO(); |
|
|
|
UpShelfPackageDTO dto = new UpShelfPackageDTO(); |
|
|
|
dto.setOrderPackageCode(orderPackageCode); |
|
|
|
dto.setOrderPackageCode(orderPackageCode); |
|
|
|
upShelfPackageList.add(dto); |
|
|
|
upShelfPackageList.add(dto); |
|
|
|
} |
|
|
|
} |
|
|
|
if(upShelfPackageList.size() > 0){ |
|
|
|
if(!upShelfPackageList.isEmpty()){ |
|
|
|
return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,Long.parseLong(warehouseId)); |
|
|
|
return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,Long.parseLong(warehouseId)); |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
return R.fail(403,"处理失败"); |
|
|
|
return R.fail(403,"处理失败"); |
|
|
@ -162,7 +162,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { |
|
|
|
ls.add(dto); |
|
|
|
ls.add(dto); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(ls.size() > 0){ |
|
|
|
if(!ls.isEmpty()){ |
|
|
|
return warehouseUpdownTypeService.downZeroOrder(ls,warehouseId,remark); |
|
|
|
return warehouseUpdownTypeService.downZeroOrder(ls,warehouseId,remark); |
|
|
|
}else{ |
|
|
|
}else{ |
|
|
|
return R.fail(403,"处理失败"); |
|
|
|
return R.fail(403,"处理失败"); |
|
|
|