diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java index 961b85125..4eb448d21 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java @@ -290,7 +290,7 @@ public abstract class FanoutConstants { /** * 车次完成 - * see @org.springblade.common.model.workNode.FinishDistributionTrainVO + * @see org.springblade.common.model.workNode.FinishDistributionTrainVO */ interface DeliveryAndFinish { @@ -350,7 +350,7 @@ public abstract class FanoutConstants { /** * 自提车次完成 - * see @org.springblade.common.model.workNode.FinishDistributionTrainVO + * @see org.springblade.common.model.workNode.FinishDistributionTrainVO */ interface BillAndFinish { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java index 1ac065ed7..07ac446f6 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java @@ -19,7 +19,6 @@ import org.springblade.common.enums.BizOperationEnums; import org.springblade.common.enums.PackageTypeEnums; import org.springblade.common.model.NodeFanoutMsg; import org.springblade.common.model.PackageData; -import org.springblade.common.model.ReservationVO; import org.springblade.common.model.StockUpVO; import org.springframework.amqp.core.ExchangeTypes; import org.springframework.amqp.rabbit.annotation.Exchange; @@ -64,8 +63,7 @@ public class StockReportListener { StockUpVO vo = JSONUtil.toBean(entries, StockUpVO.class); Long warehouseId = bean.getWarehouseId(); BizOperationEnums bizOperation = bean.getBizOperation(); - ReservationVO reservationVO = vo.getReservationVO(); - List details = reservationVO.getPackageDataList(); + List details = vo.getPackageDataList(); if (CollUtil.isNotEmpty(details)) { for (PackageData detail : details) { QualityDeliverEntity qualityDeliverEntity = QualityDeliverEntity.builder() @@ -93,7 +91,7 @@ public class StockReportListener { sendReport(qualityDeliverEntity); } } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) { - qualityDeliverEntity.setPlanReservationCode(reservationVO.getReservationCode()); + qualityDeliverEntity.setPlanReservationCode(vo.getReferenceCode()); qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch()); qualityDeliverEntity.setMallName(detail.getMallName()); qualityDeliverEntity.setMaterielCode(detail.getMaterialCode());