diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java b/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java index fee09c139..4c32aa0c6 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/StockUpVO.java @@ -37,7 +37,11 @@ public class StockUpVO implements Serializable { */ private String referenceCode; - + /** + * 预约数据列表 + * 包含包件 零担 库存破 + */ + private List packageDataList; } diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java index 88b91a2c2..689e493f1 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/QualityDeliverEntity.java @@ -33,6 +33,11 @@ public class QualityDeliverEntity extends TenantEntity { */ @ApiModelProperty(value = "业务状态 90 签收 100 签收复核 110拒签") private Integer bizStatus; + /** + * 业务编码 用于区分库存品的具体配送信息 + */ + @ApiModelProperty(value = "业务编码") + private String bizCode; /** * 事业线 */ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java index 7505560c5..ada5a25c5 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java @@ -73,10 +73,11 @@ public class BillPlanReportListener { .set(QualityDeliverEntity::getDeliveryTime, null) .set(QualityDeliverEntity::getDeliveryType, null) .set(QualityDeliverEntity::getVehicleName, null) + .set(QualityDeliverEntity::getBizCode, null) .set(QualityDeliverEntity::getDriverName, null) .set(QualityDeliverEntity::getDeliveryPlanTime, null) .set(QualityDeliverEntity::getDeliveryCreateUserName, null) - .eq(QualityDeliverEntity::getPlanTrainNumber, vo.getPickupBatch()) + .eq(QualityDeliverEntity::getBizCode, vo.getPickupBatch()) .ne(QualityDeliverEntity::getBizStatus, 110); qualityDeliverService.update(wrapper); } @@ -90,6 +91,7 @@ public class BillPlanReportListener { .deliveryTime(vo.getPickUpTime()) .deliveryType("自提") .vehicleName(vo.getPickUpPlate()) + .bizCode(vo.getPickupBatch()) .driverName(vo.getConsignee()) .deliveryPlanTime(bean.getOperatorTime()) .deliveryCreateUserName(bean.getOperator()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java index a5f319d5e..f713b3253 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java @@ -78,7 +78,7 @@ public class BillReViewReportListener { qualityDeliverEntity.setLoadNum(1); sendReport(bizOperation, qualityDeliverEntity); } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { - qualityDeliverEntity.setPlanReservationCode(vo.getPickupBatch()); + qualityDeliverEntity.setBizCode(vo.getPickupBatch()); qualityDeliverEntity.setOrderCode(detail.getOrderCode()); qualityDeliverEntity.setCategory(detail.getProductName()); qualityDeliverEntity.setConditions(2); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java index f0983b3b9..c78d58388 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java @@ -79,7 +79,7 @@ public class BillSignforReportListener { qualityDeliverEntity.setSignNum(1); sendReport(bizOperation, qualityDeliverEntity); } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { - qualityDeliverEntity.setPlanReservationCode(vo.getPickupBatch()); + qualityDeliverEntity.setBizCode(vo.getPickupBatch()); qualityDeliverEntity.setOrderCode(detail.getOrderCode()); qualityDeliverEntity.setCategory(detail.getProductName()); qualityDeliverEntity.setSignNum(detail.getNumber()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java index 7116975b8..e7b76f082 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java @@ -57,7 +57,6 @@ public class CarStartReportListener { Object main = bean.getMain(); JSONObject entries = JSONUtil.parseObj(main); CarStartVO vo = JSONUtil.toBean(entries, CarStartVO.class); - Long warehouseId = bean.getWarehouseId(); BizOperationEnums bizOperation = bean.getBizOperation(); if (BizOperationEnums.DELETE.equals(bizOperation)) { LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() @@ -75,58 +74,6 @@ public class CarStartReportListener { .ne(QualityDeliverEntity::getBizStatus, 110); qualityDeliverService.update(wrapper); } - // if (BizOperationEnums.MODIFY.equals(bizOperation) || BizOperationEnums.DELETE.equals(bizOperation)) { - // // 根据预约单号查询出所有这个预约单下的数据 先置空 - // LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() - // .set(QualityDeliverEntity::getLoadUserName, null) - // .set(QualityDeliverEntity::getLoadTime, null) - // .set(QualityDeliverEntity::getLoadLicensePlate, null) - // .set(QualityDeliverEntity::getLoadNum, null) - // .ne(QualityDeliverEntity::getBizStatus, 110); - // qualityDeliverService.update(wrapper); - // } - - // List details = new ArrayList<>(); - // if (CollUtil.isNotEmpty(details)) { - // for (PackageData detail : details) { - // QualityDeliverEntity qualityDeliverEntity = QualityDeliverEntity.builder() - // .warehouseName(bean.getWarehouse()) - // .warehouseId(warehouseId) - // .startCarUserName(bean.getOperator()) - // .startCarTime(bean.getOperatorTime()) - // .build(); - // if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) { - // qualityDeliverEntity.setConditions(1); - // qualityDeliverEntity.setLoadNum(1); - // sendReport(bizOperation, qualityDeliverEntity); - // } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { - // qualityDeliverEntity.setOrderCode(detail.getOrderCode()); - // qualityDeliverEntity.setCostCategory(detail.getProductName()); - // qualityDeliverEntity.setRevenueCategory(detail.getProductName()); - // qualityDeliverEntity.setConditions(2); - // sendReport(bizOperation, qualityDeliverEntity); - // } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) { - // qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch()); - // qualityDeliverEntity.setMallName(detail.getMallName()); - // qualityDeliverEntity.setMaterielCode(detail.getMaterialCode()); - // qualityDeliverEntity.setMaterielName(detail.getMaterialName()); - // qualityDeliverEntity.setConditions(3); - // sendReport(bizOperation, qualityDeliverEntity); - // } - // } - // } - } - - private void sendReport(BizOperationEnums bizOperation, QualityDeliverEntity qualityDeliverEntity) { - if (BizOperationEnums.ADD.equals(bizOperation) || BizOperationEnums.MODIFY.equals(bizOperation)) { - ReportQualityDeliverDTO dto = ReportQualityDeliverDTO.builder().data(JSONUtil.toJsonStr(qualityDeliverEntity)).operation(BizOperationEnums.MODIFY).build(); - factoryDataClient.sendMessage(SendMsg.builder() - .exchange(ReportConstants.REPORT_QUALITY_DELIVER_EXCHANGE) - .routingKey(ReportConstants.REPORT_QUALITY_DELIVER_ROUTINGKEY) - .message(JSONUtil.toJsonStr(dto)) - .delay(3000) - .build()); - } } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java index cade33904..94c14bb2c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java @@ -70,7 +70,7 @@ public class ConsigneeArriveReportListener { .set(QualityDeliverEntity::getArrivePositioning, null) .eq(QualityDeliverEntity::getLoadLicensePlate, vo.getVehicleName()) .eq(QualityDeliverEntity::getLoadTrainNumber, vo.getTrainNumber()) - .eq(QualityDeliverEntity::getPlanReservationCode, vo.getReservationCode()) + .eq(QualityDeliverEntity::getBizCode, vo.getReservationCode()) .ne(QualityDeliverEntity::getBizStatus, 110); qualityDeliverService.update(wrapper); } @@ -85,62 +85,10 @@ public class ConsigneeArriveReportListener { .set(QualityDeliverEntity::getArriveAddress, vo.getAddress()) .set(QualityDeliverEntity::getArrivePositioning, vo.getPositioning()) .eq(QualityDeliverEntity::getLoadTrainNumber, vo.getTrainNumber()) - .eq(QualityDeliverEntity::getPlanReservationCode, vo.getReservationCode()) + .eq(QualityDeliverEntity::getBizCode, vo.getReservationCode()) .ne(QualityDeliverEntity::getBizStatus, 110); qualityDeliverService.update(wrapper); } - // if (BizOperationEnums.MODIFY.equals(bizOperation) || BizOperationEnums.DELETE.equals(bizOperation)) { - // // 根据预约单号查询出所有这个预约单下的数据 先置空 - // LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() - // .set(QualityDeliverEntity::getLoadUserName, null) - // .set(QualityDeliverEntity::getLoadTime, null) - // .set(QualityDeliverEntity::getLoadLicensePlate, null) - // .set(QualityDeliverEntity::getLoadNum, null) - // .ne(QualityDeliverEntity::getBizStatus, 110); - // qualityDeliverService.update(wrapper); - // } - - // List details = new ArrayList<>(); - // if (CollUtil.isNotEmpty(details)) { - // for (PackageData detail : details) { - // QualityDeliverEntity qualityDeliverEntity = QualityDeliverEntity.builder() - // .warehouseName(bean.getWarehouse()) - // .warehouseId(warehouseId) - // .startCarUserName(bean.getOperator()) - // .startCarTime(bean.getOperatorTime()) - // .build(); - // if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) { - // qualityDeliverEntity.setConditions(1); - // qualityDeliverEntity.setLoadNum(1); - // sendReport(bizOperation, qualityDeliverEntity); - // } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { - // qualityDeliverEntity.setOrderCode(detail.getOrderCode()); - // qualityDeliverEntity.setCostCategory(detail.getProductName()); - // qualityDeliverEntity.setRevenueCategory(detail.getProductName()); - // qualityDeliverEntity.setConditions(2); - // sendReport(bizOperation, qualityDeliverEntity); - // } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) { - // qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch()); - // qualityDeliverEntity.setMallName(detail.getMallName()); - // qualityDeliverEntity.setMaterielCode(detail.getMaterialCode()); - // qualityDeliverEntity.setMaterielName(detail.getMaterialName()); - // qualityDeliverEntity.setConditions(3); - // sendReport(bizOperation, qualityDeliverEntity); - // } - // } - // } - } - - private void sendReport(BizOperationEnums bizOperation, QualityDeliverEntity qualityDeliverEntity) { - if (BizOperationEnums.ADD.equals(bizOperation) || BizOperationEnums.MODIFY.equals(bizOperation)) { - ReportQualityDeliverDTO dto = ReportQualityDeliverDTO.builder().data(JSONUtil.toJsonStr(qualityDeliverEntity)).operation(BizOperationEnums.MODIFY).build(); - factoryDataClient.sendMessage(SendMsg.builder() - .exchange(ReportConstants.REPORT_QUALITY_DELIVER_EXCHANGE) - .routingKey(ReportConstants.REPORT_QUALITY_DELIVER_ROUTINGKEY) - .message(JSONUtil.toJsonStr(dto)) - .delay(3000) - .build()); - } } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java index da9a4a765..324b44d80 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java @@ -63,16 +63,6 @@ public class LoadingReportListener { Long warehouseId = bean.getWarehouseId(); BizOperationEnums bizOperation = bean.getBizOperation(); List details = vo.getPackageDataList(); - // if (BizOperationEnums.MODIFY.equals(bizOperation) || BizOperationEnums.DELETE.equals(bizOperation)) { - // // 根据预约单号查询出所有这个预约单下的数据 先置空 - // LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() - // .set(QualityDeliverEntity::getLoadUserName, null) - // .set(QualityDeliverEntity::getLoadTime, null) - // .set(QualityDeliverEntity::getLoadLicensePlate, null) - // .set(QualityDeliverEntity::getLoadNum, null) - // .ne(QualityDeliverEntity::getBizStatus, 110); - // qualityDeliverService.update(wrapper); - // } if (CollUtil.isNotEmpty(details)) { for (PackageData detail : details) { QualityDeliverEntity qualityDeliverEntity = QualityDeliverEntity.builder() @@ -91,7 +81,7 @@ public class LoadingReportListener { sendReport(bizOperation, qualityDeliverEntity); } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { qualityDeliverEntity.setOrderCode(detail.getOrderCode()); - qualityDeliverEntity.setPlanReservationCode(vo.getReservationCode()); + qualityDeliverEntity.setBizCode(vo.getReservationCode()); qualityDeliverEntity.setCategory(detail.getProductName()); qualityDeliverEntity.setConditions(2); sendReport(bizOperation, qualityDeliverEntity); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java index e62bf083e..87bef8d62 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java @@ -94,7 +94,7 @@ public class PlanReportListener { .set(QualityDeliverEntity::getDeliveryPlanTime, null) .set(QualityDeliverEntity::getDeliveryCreateUserName, null) .eq(QualityDeliverEntity::getPlanTrainNumber, vo.getTrainNumber()) - .eq(QualityDeliverEntity::getPlanReservationCode, reservationVO.getReservationCode()) + .eq(QualityDeliverEntity::getBizCode, reservationVO.getReservationCode()) .ne(QualityDeliverEntity::getBizStatus, 110); qualityDeliverService.update(wrapper); } @@ -142,7 +142,7 @@ public class PlanReportListener { } } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) { invMap.put(detail.getMallName()+detail.getMaterialCode(), qualityDeliverEntity); - qualityDeliverEntity.setPlanReservationCode(reservationVO.getReservationCode()); + qualityDeliverEntity.setBizCode(reservationVO.getReservationCode()); qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch()); qualityDeliverEntity.setMallName(detail.getMallName()); qualityDeliverEntity.setMaterielCode(detail.getMaterialCode()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java index 7e4e9fb61..682f52edf 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/QualityDeliverListener.java @@ -47,7 +47,7 @@ import java.util.List; @Slf4j @Component @AllArgsConstructor -public class QualityDeliverListener { +public class QualityDeliverListener { @Resource private IQualityDeliverService qualityDeliverService; @@ -105,8 +105,8 @@ public class QualityDeliverListener { .eq(QualityDeliverEntity::getOrderCode, qualityDeliverEntity.getOrderCode()) .eq(QualityDeliverEntity::getCategory, qualityDeliverEntity.getCategory()) .lt(QualityDeliverEntity::getBizStatus, 110); - if (StrUtil.isNotEmpty(qualityDeliverEntity.getPlanReservationCode())) { - wrapper.eq(QualityDeliverEntity::getPlanReservationCode, qualityDeliverEntity.getPlanReservationCode()); + if (StrUtil.isNotEmpty(qualityDeliverEntity.getBizCode())) { + wrapper.eq(QualityDeliverEntity::getBizCode, qualityDeliverEntity.getBizCode()); } saveOrUpdate(wrapper, qualityDeliverEntity); } @@ -157,9 +157,9 @@ public class QualityDeliverListener { } } } - if (StrUtil.isNotEmpty(qualityDeliverEntity.getPlanReservationCode())) { + if (StrUtil.isNotEmpty(qualityDeliverEntity.getBizCode())) { // 有预约单号时加上预约单号过滤：存在同一个库存品在多个预约单中，只根据库存品本身的信息无法查询出对应的数据的情况。 - wrapper.eq(QualityDeliverEntity::getPlanReservationCode, qualityDeliverEntity.getPlanReservationCode()); + wrapper.eq(QualityDeliverEntity::getBizCode, qualityDeliverEntity.getBizCode()); } return wrapper; } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java index ec39889d6..d70727958 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java @@ -78,7 +78,7 @@ public class ReViewReportListener { qualityDeliverEntity.setLoadNum(1); sendReport(bizOperation, qualityDeliverEntity); } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { - qualityDeliverEntity.setPlanReservationCode(vo.getReservationCode()); + qualityDeliverEntity.setBizCode(vo.getReservationCode()); qualityDeliverEntity.setOrderCode(detail.getOrderCode()); qualityDeliverEntity.setCategory(detail.getProductName()); qualityDeliverEntity.setConditions(2); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java index c766ac9e6..d56b33b43 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java @@ -71,6 +71,7 @@ public class ReservationPlanReportListener { LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() .set(QualityDeliverEntity::getPlanReservationCreateTime, null) .set(QualityDeliverEntity::getPlanReservationCode, null) + .set(QualityDeliverEntity::getBizCode, null) .set(QualityDeliverEntity::getPlanReservationTime, null) .set(QualityDeliverEntity::getPlanReservationUser, null) .set(QualityDeliverEntity::getPlanNum, null) @@ -90,6 +91,7 @@ public class ReservationPlanReportListener { .orderPackageCode(detail.getPackageCode()) .planReservationCreateTime(bean.getOperatorTime()) .planReservationCode(vo.getReservationCode()) + .bizCode(vo.getReservationCode()) .planReservationTime(vo.getReservationDate()) .planReservationUser(bean.getOperator()) .planNum(detail.getNumber()) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java index 04faee4e6..6d5999c9f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java @@ -82,7 +82,7 @@ public class SignforReportListener { qualityDeliverEntity.setSignNum(1); sendReport(bizOperation, qualityDeliverEntity); } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { - qualityDeliverEntity.setPlanReservationCode(vo.getReservationCode()); + qualityDeliverEntity.setBizCode(vo.getReservationCode()); qualityDeliverEntity.setOrderCode(detail.getOrderCode()); qualityDeliverEntity.setCategory(detail.getProductName()); qualityDeliverEntity.setSignNum(detail.getNumber()); 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 07ac446f6..841bb02b4 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 @@ -91,7 +91,7 @@ public class StockReportListener { sendReport(qualityDeliverEntity); } } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) { - qualityDeliverEntity.setPlanReservationCode(vo.getReferenceCode()); + qualityDeliverEntity.setBizCode(vo.getReferenceCode()); qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch()); qualityDeliverEntity.setMallName(detail.getMallName()); qualityDeliverEntity.setMaterielCode(detail.getMaterialCode()); @@ -101,7 +101,7 @@ public class StockReportListener { if (BizOperationEnums.ADD.equals(bizOperation) || BizOperationEnums.MODIFY.equals(bizOperation)) { List list = qualityDeliverService.list(Wrappers.lambdaQuery() .select(QualityDeliverEntity::getId) - .eq(QualityDeliverEntity::getPlanReservationCode, qualityDeliverEntity.getPlanReservationCode()) + .eq(QualityDeliverEntity::getBizCode, qualityDeliverEntity.getBizCode()) .eq(QualityDeliverEntity::getMallName, qualityDeliverEntity.getMallName()) .eq(QualityDeliverEntity::getMaterielCode, qualityDeliverEntity.getMaterielCode()) .isNull(QualityDeliverEntity::getOrderPackageCode) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index 47a3b1089..a146880e7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -1047,7 +1047,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl