|
|
|
@ -2852,7 +2852,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
List<TrunklineAdvanceDetailEntity> list = trunklineAdvanceDetailClient.selectByOrderCodeAndWarehouseId(orderCode,warehouseIdList.stream().map(String::valueOf).collect(Collectors.joining(","))); |
|
|
|
|
if (!list.isEmpty()) { |
|
|
|
|
List<String> orderPackageCodes = list.stream().map(TrunklineAdvanceDetailEntity::getOrderPackageCode).collect(Collectors.toList()); |
|
|
|
|
info = handlePackageGroupByWarehouse(list,warehouseIdList,orderPackageCodes,Objects.isNull(myCurrentWarehouse),orderCode); |
|
|
|
|
info = handlePackageGroupByWarehouse(list,warehouseIdList,orderPackageCodes,Objects.isNull(myCurrentWarehouse),orderCode); |
|
|
|
|
|
|
|
|
|
return R.data(info); |
|
|
|
|
} |
|
|
|
@ -2908,6 +2908,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
|
|
|
|
|
DistributionParcelListVO distributionParcelListVO = new DistributionParcelListVO(); |
|
|
|
|
distributionParcelListVO.setWaybillNumber(trunklineAdvanceDetailEntity.getWaybillNo()); |
|
|
|
|
distributionParcelListVO.setOrderCode(trunklineAdvanceDetailEntity.getOrderCode()); |
|
|
|
|
distributionParcelListVO.setOrderPackageCode(trunklineAdvanceDetailEntity.getOrderPackageCode()); |
|
|
|
|
distributionParcelListVO.setWarehouse(trunklineAdvanceDetailEntity.getWarehouseName()); |
|
|
|
|
distributionParcelListVO.setOrderPackageStatusName(OrderPackageStatusConstant.weiruku.getName()); |
|
|
|
|
distributionParcelListVO.setFirsts(trunklineAdvanceDetailEntity.getFirstPackName()); |
|
|
|
|