Merge branch 'dev' into pre-production

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;
 
 
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -92,6 +92,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		// 通过ID 获取老系统的订单数据
 		Integer wayBillId = waybillDTO.getId();
 		Integer allNum = waybillDTO.getNumber();
+		Integer oprationWarehouseId = waybillDTO.getWarehouseId();
 		Date date = new Date();
 		Long waybillId = null;
 		boolean isOrder = false;
@@ -107,11 +108,15 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 			log.warn("##############waybillDataHandler: 老系统中未找到对应运单waybillId={}", waybillDTO.getId());
 			throw new CustomerException("老系统中未找到对应运单");
 		}
-
+		Integer warehouseId = wayBillEntity.getWarehouseId();
+		if(!warehouseId.equals(oprationWarehouseId)){
+			log.warn("##############waybillDataHandler: 作业仓库与目的仓不同 warehouseId={} oprationWarehouseId={}", warehouseId,oprationWarehouseId);
+			throw new CustomerException("作业仓库与目的仓不同");
+		}
 
 		// 需要验证当前需要开启的数据推送仓库
-		if(!OldSystemDataPushConfig.getWarehourseIdList().contains(wayBillEntity.getWarehouseId()+"")){
-			log.info(">>>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", wayBillEntity.getWarehouseId());
+		if(!OldSystemDataPushConfig.getWarehourseIdList().contains(warehouseId+"")){
+			log.info(">>>> waybillDataHandler 当前开单仓库不是目前系统上线运行仓库 {}", warehouseId);
 			throw new CustomerException("当前开单仓库不是目前系统上线运行仓库");
 		}