Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1207,10 +1207,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		Long nowWarehouseId = carsLoadEntity.getNowWarehouseId();//当前节点id
 		String carsNo = carsLoadEntity.getCarsNo();
 
-		if (!warehouseId.equals(nowWarehouseId)) {
-			log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
-			throw new CustomerException(400, "配载未到达当前仓");
-		}
+//		if (!warehouseId.equals(nowWarehouseId)) {
+//			log.warn("#############cancelArriveCarByLoadId: 配载未到达当前仓 loadId={} nowWarehouseId={}", loadId, nowWarehouseId);
+//			throw new CustomerException(400, "配载未到达当前仓");
+//		}
 
 		String loadStatus = carsLoadEntity.getLoadStatus();