diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java index 2e41aa583..97cd225fa 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WaybillDTO.java @@ -1,6 +1,5 @@ package com.logpm.warehouse.dto; -import io.swagger.models.auth.In; import lombok.Data; import java.io.Serializable; @@ -35,6 +34,7 @@ public class WaybillDTO implements Serializable { private Integer isZero; + private Integer warehouseId; } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 052369ba1..cb6323934 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -92,6 +92,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl>>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", wayBillEntity.getWarehouseId()); + if(!OldSystemDataPushConfig.getWarehourseIdList().contains(warehouseId+"")){ + log.info(">>>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", warehouseId); throw new CustomerException("当前开单仓库不是目前系统上线运行仓库"); }