diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java index 40f944836..f81731ed7 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionParcelListVO.java @@ -134,6 +134,11 @@ public class DistributionParcelListVO extends DistributionParcelListEntity { * 签收数量 */ private String loadingTime; + + /** + * 配送车次号 + */ + private String deliveryTrainNumber; /** * 实际装车人 */ diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java index 5b37b61c9..aebfc01c2 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java @@ -170,6 +170,11 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity { */ private String isZeroString; + /** + * 是否零担显示 + */ + private String reservationCode; + private Integer unreceivedQuantity; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java index 9eeaa1d32..1d80793c7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryPackageExcel.java @@ -39,6 +39,20 @@ public class DistributionDeliveryPackageExcel implements Serializable { private static final long serialVersionUID = 1L; + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("配送车次号") + private String deliveryTrainNumber; + + /** + * 租户号 + */ + @ColumnWidth(20) + @ExcelProperty("预约单号") + private String reservationCode; + /** * 租户号 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml index cb71fa228..2ffd15749 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml @@ -929,6 +929,12 @@ and ldpl.warehouse_id = #{paramMap.warehouseId} + + and ldpl.warehouse_id IN + + #{wItem} + + and ldpl.tenant_id = #{paramMap.tenantId} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java index 144a2f312..a1f3f5734 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java @@ -241,10 +241,10 @@ public interface DistributionReservationMapper extends BaseMapper selectOrderInfoByReservationId(Long parseLong); + List selectOrderInfoByReservationId(@Param("reservationId") Long reservationId); /** * 查询预约零担订单详情 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index bf4d52f2a..90c473006 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -1242,6 +1242,7 @@ ldrs.is_have_data, ldsa.id AS id, ldsa.waybill_number AS waybillNumber, + lds.reservation_code AS reservationCode, ldrs.is_zero FROM logpm_distribution_reservation AS lds diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index a7a4ca4ad..426830bd0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -710,7 +710,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl info = new HashMap<>(); + info.put("orderPackageCode",parcelListEntity.getOrderPackageCode()); + info.put("warehouseId",myCurrentWarehouse.getId()); + warehouseUpdownTypeClient.downDeliveryPackage(info); Map map = new HashMap(); String distrilbutionloadingscanDTOJson = JSONObject.toJSONString(distrilbutionloadingscanDTO); @@ -736,6 +740,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId()); List deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId); @@ -4376,6 +4383,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListVOS = new ArrayList<>(); if (Func.isNotEmpty(reservationStockarticleEntityList)) { List orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); + List reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList()); + Map map = new HashMap<>(); + if (!reservationId.isEmpty()) { + for (Long l : reservationId) { + List distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l); + distributionStockArticleVOS.forEach(s->{ + map.put(s.getId(),s.getReservationCode()); + }); + } + } if (Func.isNotEmpty(orderIds)) { //查询该客户的非零但订单包间 IPage parcelListEntityList = distributionReservationMapper.getReservationPackage(page, orderIds, distributionDeliveryInfoDTO); @@ -4385,6 +4402,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList.getRecords()); for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) { // log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO); + distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber()); + if (!map.isEmpty()){ + distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId())); + } if (Func.isNotEmpty(loadingDataMap)) { DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId()); // log.info(">>>>>> loadscanEntity {}", loadscanEntity); @@ -4608,6 +4629,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelNumberVOS = baseMapper.getZeroPackageListByDeliveryId(distributionDeliveryInfoDTO.getDeliveryId()); + DistributionDeliveryListEntity deliveryListEntity = this.getById(deliveryId); + List deliveryStockArticleInfo = baseMapper.getDeliveryStockArticleInfo(deliveryId); if (Func.isEmpty(deliveryStockArticleInfo)) { log.error("配送任务订单查询异常:{}", deliveryStockArticleInfo); @@ -4628,6 +4651,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl distributionParcelListVOS = new ArrayList<>(); if (Func.isNotEmpty(reservationStockarticleEntityList)) { List orderIds = reservationStockarticleEntityList.stream().filter(order -> order.getIsZero().equals(IsOrNoConstant.no.getValue())).map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList()); + List reservationId = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getReservationId).collect(Collectors.toList()); + Map map = new HashMap<>(); + if (!reservationId.isEmpty()) { + for (Long l : reservationId) { + List distributionStockArticleVOS = distributionReservationMapper.selectOrderInfoByReservationId(l); + distributionStockArticleVOS.forEach(s->{ + map.put(s.getId(),s.getReservationCode()); + }); + } + } if (Func.isNotEmpty(orderIds)) { //查询该客户的非零但订单包间 List parcelListEntityList = distributionReservationMapper.getReservationPackageByDeliveryId(orderIds, deliveryId); @@ -4637,6 +4670,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl parcelListVOList = DistributionParcelListWrapper.build().listVO(parcelListEntityList); for (DistributionParcelListVO distributionParcelListVO : parcelListVOList) { log.info(">>>>>> distributionParcelListVO {}", distributionParcelListVO); + distributionParcelListVO.setDeliveryTrainNumber(deliveryListEntity.getTrainNumber()); + if (!map.isEmpty()){ + distributionParcelListVO.setReservationCode(map.get(distributionParcelListVO.getStockArticleId())); + } if (Func.isNotEmpty(loadingDataMap)) { DistributionLoadscanEntity loadscanEntity = loadingDataMap.get(distributionParcelListVO.getId()); log.info(">>>>>> loadscanEntity {}", loadscanEntity); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index 7501fa694..f7030cece 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -677,7 +677,13 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl warehouseList = warehouseClient.getMyWarehouseList(); + if (!warehouseList.isEmpty()) { + List warehouseIds = warehouseList.stream().map(BasicdataWarehouseEntity::getId).collect(Collectors.toList()); + paramMap.put("warehouseIds", warehouseIds); + } + }else { + paramMap.put("warehouseId", myCurrentWarehouse.getId()); } // 用户勾选数据的ids Object ids = paramMap.get("ids"); @@ -687,7 +693,6 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl list = baseMapper.exportDistributionParcelList(paramMap, idArr); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index be6d48f19..52cc51a4e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -5672,6 +5672,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImplupdate().lambda() + .eq(DistributionSignforEntity::getReservationId, distributionSignfor.getReservationId()) + .set(DistributionSignforEntity::getDriverSigning, "2") + .set(!Objects.isNull(distributionSignfor.getDriverRemarks()),DistributionSignforEntity::getDriverRemarks, "2") + ); } return false;