diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPackageInfo.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPackageInfo.java
index 05a3538ba..d1d9db15b 100644
--- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPackageInfo.java
+++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/entity/MtPackageInfo.java
@@ -2,6 +2,7 @@ package com.logpm.factory.mt.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +21,7 @@ public class MtPackageInfo extends BaseEntity {
 	private String outboundMan;
 
 	//@JsonProperty("出库时间")
-	@ApiModelProperty(value = "出库时间")
+	@ApiModelProperty(value = "出库时间" )
 	private String outboundDate;
 
 	//@JsonProperty("数量")
diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtFactoryOrderMainVO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtFactoryOrderMainVO.java
index b1c050f2a..83fa35895 100644
--- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtFactoryOrderMainVO.java
+++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtFactoryOrderMainVO.java
@@ -16,11 +16,14 @@
  */
 package com.logpm.factory.mt.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.logpm.factory.mt.entity.MtFactoryOrderMain;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 梦天工厂主订单 视图实体类
  *
@@ -38,6 +41,10 @@ public class MtFactoryOrderMainVO extends MtFactoryOrderMain {
 	@ApiModelProperty(value = "反馈梦天状态")
 	private String pushStatusName;
 
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value = "推送时间")
+	private Date pushTime;
+
 
 
 }
diff --git a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoVO.java b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoVO.java
index a5ba9011b..cc8a2550d 100644
--- a/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoVO.java
+++ b/blade-service-api/logpm-factory-api/src/main/java/com/logpm/factory/mt/vo/MtPackageInfoVO.java
@@ -16,11 +16,14 @@
  */
 package com.logpm.factory.mt.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.logpm.factory.mt.entity.MtPackageInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 梦天订单包件 视图实体类
  *
@@ -35,7 +38,6 @@ public class MtPackageInfoVO extends MtPackageInfo {
 
 	@ApiModelProperty(value = "订单号")
 	private String orderCode;
-
 	/**
 	 * 车次号
 	 */
@@ -46,4 +48,9 @@ public class MtPackageInfoVO extends MtPackageInfo {
 	private String pushStatusName;
 
 
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("推送时间")
+	private Date pushTime;
+
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
index 22c22d540..631c1500b 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
@@ -222,6 +222,9 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 //		}
 		BasicdataWarehouseEntity warehouseEntity = null;
 		List<BasicdataWarehouseEntity> warehouseEntityList = baseMapper.selectList(Wrappers.<BasicdataWarehouseEntity>query().lambda().in(BasicdataWarehouseEntity::getDepartment, deptIds));
+		if(warehouseEntityList.isEmpty()){
+			return warehouseEntity;
+		}
 //		String json = redis.get(CacheNames.tenantKeyObj(user.getTenantId(), CacheNames.USER_WAREHOUSE_KEY, user.getUserId()));
 		if (warehouseEntityList.size() <= 1) {
 			warehouseEntity = warehouseEntityList.get(0);
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml
index bc8546155..4842eac76 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtFactoryOrderMainMapper.xml
@@ -61,26 +61,44 @@
     </select>
 
     <select id="selectMtFactoryOrderMainByPushType" resultMap="mtfactoryOrderMainResultMap">
+
+        SELECT temp.* from (
         select mfo.id,
-            mfo.invoice_order_code,
-            mfo.center_warehouse_code,
-            mfo.center_warehouse_name,
-            mfo.order_type,
-            mfo.warehouse_type,
-            mfo.send_car_number,
-            mfo.send_car_driver,
-            mfo.send_car_driver_phone,
-            mfo.really_man,
-            mfo.really_date,
-            mpd.push_status
-        from mt_factory_order_main mfo LEFT JOIN mt_push_data mpd on mpd.ref_id= mfo.id
+        mfo.invoice_order_code,
+        mfo.center_warehouse_code,
+        mfo.center_warehouse_name,
+        mfo.order_type,
+        mfo.warehouse_type,
+        mfo.send_car_number,
+        mfo.send_car_driver,
+        mfo.send_car_driver_phone,
+        mfo.really_man,
+        mfo.really_date,
+        mpd.push_status,
+        mfo.create_time
+        from mt_factory_order_main mfo LEFT JOIN mt_push_data mpd on mpd.ref_id= mfo.id where mfo.is_deleted=0 )  temp
         <where>
             <if test="mtFactoryOrderMain.invoiceOrderCode!=null ">
-                and mfo.invoice_order_code= #{mtFactoryOrderMain.invoiceOrderCode}
+                and temp.invoice_order_code= #{mtFactoryOrderMain.invoiceOrderCode}
+            </if>
+
+            <if test="mtFactoryOrderMain.warehouseType!=null ">
+               and  temp.warehouse_type= #{mtFactoryOrderMain.warehouseType}
             </if>
 
+            <if test="mtFactoryOrderMain.pushStatus!=null ">
+
+                <if test="mtFactoryOrderMain.pushStatus==2 ">
+                   and temp.push_status is null
+                </if>
+                <if test="mtFactoryOrderMain.pushStatus==1 ">
+                  and  temp.push_status= #{mtFactoryOrderMain.pushStatus}
+                </if>
+            </if>
+
+
         </where>
-        order by mfo.create_time desc
+        order by temp.create_time desc
     </select>
 
 </mapper>
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml
index 18ad9263f..6d01976da 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPackageInfoMapper.xml
@@ -25,7 +25,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
     </resultMap>
-    
+
     <resultMap id="mtPackageInfoDetailVO" type="com.logpm.factory.mt.vo.MtPackageInfoDetailVO">
         <result column="id" property="id"/>
         <result column="outbound_man" property="outboundMan"/>
@@ -58,32 +58,58 @@
 
     <select id="listBySendData" resultType="com.logpm.factory.mt.vo.MtPackageInfoVO">
 
-        SELECT
-            pi.id,
-            pi.outbound_man,
-            pi.outbound_date,
-            pi.number,
-            pi.package_code,
-            pi.package_type,
-            pi.big_type,
-            pi.small_type,
-            pi.color,
-            pi.model,
-            pi.size,
-            fo.order_code,
-            fom.invoice_order_code,
-        mpd.push_status
+
+
+        SELECT ts.* from
+        (SELECT
+        pi.id,
+        pi.outbound_man,
+        pi.outbound_date,
+        pi.number,
+        pi.package_code,
+        pi.package_type,
+        pi.big_type,
+        pi.small_type,
+        pi.color,
+        pi.model,
+        pi.size,
+        pi.create_time,
+        fo.order_code,
+        fom.invoice_order_code,
+        mpd.push_status,
+        mpd.push_time
         FROM
-            mt_package_info pi
+        mt_package_info pi
         LEFT JOIN mt_factory_order fo on fo.id=pi.order_id
         LEFT JOIN mt_factory_order_main fom on fom.id=fo.main_id
         LEFT JOIN mt_push_data mpd on mpd.ref_code=pi.package_code
         WHERE
-	    pi.is_deleted = 0
-	    <if test="mtPackageInfoVO.invoiceOrderCode!=null ">
-	        and fom.invoice_order_code= #{mtPackageInfoVO.invoiceOrderCode}
-        </if>
-        order by pi.create_time desc
+        pi.is_deleted = 0) ts
+        <where>
+            <if test="mtPackageInfoVO.invoiceOrderCode!=null ">
+                 and ts.invoice_order_code= #{mtPackageInfoVO.invoiceOrderCode}
+            </if>
+
+            <if test="mtPackageInfoVO.orderCode!=null ">
+                and ts.order_code= #{mtPackageInfoVO.orderCode}
+            </if>
+
+            <if test="mtPackageInfoVO.packageCode!=null ">
+                and ts.package_code= #{mtPackageInfoVO.packageCode}
+            </if>
+
+            <if test="mtPackageInfoVO.pushStatus!=null ">
+                <if test="mtPackageInfoVO.pushStatus==2 ">
+                    and ts.push_status is null
+                </if>
+                <if test="mtPackageInfoVO.pushStatus==1 ">
+                    and ts.push_status= #{mtPackageInfoVO.pushStatus}
+                </if>
+            </if>
+
+        </where>
+
+        order by ts.create_time desc
     </select>
 
     <select id="getMtPackageInfo" resultMap="mtPackageInfoDetailVO">
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
index d17832a8b..0ae4ed95a 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java
@@ -331,6 +331,13 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			logger.info("#############qianshouScan: 未找到对应订单mainId={}", mainId);
 			return Resp.fail(400, "未找到对应订单");
 		}
+		// 需要判断本次任务是否为中心仓的订单
+		if("转运仓".equals(mtFactoryOrderMain.getWarehouseType())){
+			// 转运仓的订单和签收不进行推送
+			logger.info("############# 转运仓的数据不进行推送 mtFactoryOrderMain={}", mtFactoryOrderMain);
+			return Resp.fail(400, "转运仓的数据不进行推送");
+		}
+
 
 		String distributionContactId = orderStatusDTO.getDistributionContactId();//送货任务ID
 		String invoiceOrderCode = mtFactoryOrderMain.getInvoiceOrderCode();//发货单编号
@@ -382,6 +389,13 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 			logger.info("#############handleStatusData: 未找到对应订单mainId={}", mainId);
 			return Resp.fail(400, "未找到对应订单");
 		}
+		// 需要判断本次任务是否为中心仓的订单
+		if("转运仓".equals(mtFactoryOrderMain.getWarehouseType())){
+			// 转运仓的订单和签收不进行推送
+			logger.info("############# 转运仓的数据不进行推送 mtFactoryOrderMain={}", mtFactoryOrderMain);
+			return Resp.fail(400, "转运仓的数据不进行推送");
+		}
+
 
 
 		// 验证该数据是否推送过
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java
index b4732bc89..8397af989 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java
@@ -83,20 +83,27 @@ public class OpOldReceivingDataHandler {
 				WarehouseEntity warehouseEntity = warehouseClient.findByCode(warehouseCode);
 				// 请求老系统的登录接口
 
-				if(!ObjectUtils.isNull(warehouseEntity)){
+				if (!ObjectUtils.isNull(warehouseEntity)) {
 					String authCode = oldLogin(warehouseEntity.getId());
 					// 推送数据
 					if (StringUtil.isNotBlank(authCode)) {
 						boolean isSuccess = sendPackageData(authCode, orderPackageCode);
 						if (isSuccess) {
 							// 请求成功 修改推送数据的状态 修改未1
-							packageEntity.setOldPushStatus(1);
+							if (ObjectUtils.isNotNull(packageEntity)) {
+								packageEntity.setOldPushStatus(1);
+							}
 						} else {
-							packageEntity.setOldPushStatus(2);
+							if (ObjectUtils.isNotNull(packageEntity)) {
+								packageEntity.setOldPushStatus(2);
+							}
 						}
 					}
-				}else{
-					packageEntity.setOldPushStatus(2);
+				} else {
+
+					if (ObjectUtils.isNotNull(packageEntity)) {
+						packageEntity.setOldPushStatus(2);
+					}
 
 				}
 
@@ -106,11 +113,16 @@ public class OpOldReceivingDataHandler {
 			log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统,orderPackageCode:{},warehouseName{}",
 				orderPackageCode, warehouseName);
 			log.error(e.getMessage());
-			packageEntity.setOldPushStatus(2);
+			if (ObjectUtils.isNotNull(packageEntity)) {
+				packageEntity.setOldPushStatus(2);
+			}
 //			opPushPackageSystemEntity.setPushStatus(2);
 
 		}
-		factoryPackageService.updateById(packageEntity);
+
+		if (ObjectUtils.isNotNull(packageEntity)) {
+			factoryPackageService.updateById(packageEntity);
+		}
 
 	}
 
@@ -124,14 +136,15 @@ public class OpOldReceivingDataHandler {
 		map.put("user_id", oldSystemProperties.getUserId());
 		map.put("pick_up_id", "");
 		map.put("origin", "按件入库");
+		log.info("##################sendPackageData: 请求老系统接口 start  map {}", map);
 
 		String url = oldSystemProperties.getUrl() + "api/scan";
-		String body = HttpRequest.post(url).form(map).header("token",authCode).execute().body();
+		String body = HttpRequest.post(url).form(map).header("token", authCode).execute().body();
 		log.info("##################sendPackageData: 请求老系统接口,url:{},body:{}", url, body);
 		if (StringUtil.isNotBlank(body)) {
 
 			JSONObject res = JSON.parseObject(body);
-			if("200".equals(res.getString("code"))){
+			if ("200".equals(res.getString("code"))) {
 				return true;
 			}
 
@@ -148,7 +161,7 @@ public class OpOldReceivingDataHandler {
 	 */
 	private String oldLogin(Integer warhouseId) {
 		String o = bladeRedis.get(oldSystemProperties.getUserId() + "_" + warhouseId);
-		if(StringUtil.isBlank(o)){
+		if (StringUtil.isBlank(o)) {
 			String url = oldSystemProperties.getUrl() + "api/fakeLogin";
 
 			Map<String, Object> map = new HashMap<>();
@@ -163,8 +176,8 @@ public class OpOldReceivingDataHandler {
 
 			if ("200".equals(authCode.getString("code"))) {
 
-				o= authCode.getJSONObject("data").getJSONObject("token").getString("token");
-				bladeRedis.setEx(oldSystemProperties.getUserId() + "_" + warhouseId, o,30*60L);
+				o = authCode.getJSONObject("data").getJSONObject("token").getString("token");
+				bladeRedis.setEx(oldSystemProperties.getUserId() + "_" + warhouseId, o, 30 * 60L);
 
 			}
 		}
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
index 6535e1746..75ccbe9ed 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpReceivingDataHandler.java
@@ -41,8 +41,8 @@ public class OpReceivingDataHandler {
 			panFactoryDataService.handleDataToPlatform(orderPackageCode, receivingTime);
 
 		} catch (Exception e) {
-			log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统,orderPackageCode:{},receivingTime:{}",
-				orderPackageCode,receivingTime);
+			log.error("##################opReceivingDataHandler: 处理欧派收货数据到新系统,orderPackageCode:{},receivingTime:{},msg:{}",
+				orderPackageCode,receivingTime,e.getMessage());
 		}
 
 	}
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
index 5d094f426..70501df77 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java
@@ -73,7 +73,6 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	private IOssClient ossClient;
 
 
-
 	@Override
 	public String saveOuPaiFactoryOrderDTOByCarCarNumber(String code) {
 
@@ -104,18 +103,18 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 //		handlePackageData(url, event);
 		//orderCode现在是包件码
 		QueryWrapper<FactoryPackageEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("oid",orderPackageCode);
+		queryWrapper.eq("oid", orderPackageCode);
 		FactoryPackageEntity packageEntity = factoryPackageService.getOne(queryWrapper);
-		if(Objects.isNull(packageEntity)) {
-			log.error("############oid 查询数据失败: {}",orderPackageCode);
+		if (Objects.isNull(packageEntity)) {
+			log.error("############oid 查询数据失败: {}", orderPackageCode);
 			return orderPackageCode;
 		}
 		packageEntity.setPackageStatus(5);
 		factoryPackageService.updateById(packageEntity);
 
 		JSONObject jo = new JSONObject();
-		jo.put("orderPackageCode",packageEntity.getCode());
-		jo.put("receivingTime",CommonUtil.dateToString(packageEntity.getUpdateTime()));
+		jo.put("orderPackageCode", packageEntity.getCode());
+		jo.put("receivingTime", CommonUtil.dateToString(packageEntity.getUpdateTime()));
 
 		//真正的处理需要的数据
 		Map<String, Object> map = new HashMap<>();
@@ -135,33 +134,61 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	}
 
 
-
 	@Override
 	public String saveOuPaiPackageStatusByCodeByOld(String key, Integer event, String warehouseName) {
 		QueryWrapper<FactoryPackageEntity> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("oid",key);
+		queryWrapper.eq("oid", key);
 		FactoryPackageEntity packageEntity = factoryPackageService.getOne(queryWrapper);
-		String code;
-		if(Objects.isNull(packageEntity)) {
-			log.error("############oid 查询数据失败: {}",key);
+		String code=null;
+		String endWarehouseName = null;
+		if (Objects.isNull(packageEntity)) {
+			log.error("############oid 查询数据失败: {}", key);
 			// 查询欧派系统的的数据
-			String url =ouPaiProperties.getUri()+"tims_odata_api/api/odata/Package("+key+")?select=Code,PackageStatus,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,BuyIn,CosourcingCode,CosourcingUnit,Length,Width,Height,Weight,IsInventory,SendTime,ReceivingTime,CreateTime,ShipTime,CarNumber,DeliveryMethod&$expand=ReceivingOrders($select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber)";
+			String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/Package(" + key + ")?select=Code,PackageStatus,FirstClassCode,FirstClassName,SecondClassCode,SecondClassName,ThirdClassCode,ThirdClassName,BuyIn,CosourcingCode,CosourcingUnit,Length,Width,Height,Weight,IsInventory,SendTime,ReceivingTime,CreateTime,ShipTime,CarNumber,DeliveryMethod&$expand=ReceivingOrders($select=Code,Type,Status,Plate,PackagesCount,ReceivePackageCount,PlateNum,CarNumber,CarrierCode,SendTime,ArrivalTime,ReceiveTime,CreateTime,ReturnNumber;$expand=EndWarehouse($select=Name,Code))";
 			OpOrderStatusLogEntity opOrderStatusLogEntity = sendRequestData(url, event);
 
 			JSONObject jsonObject = JSONObject.parseObject(opOrderStatusLogEntity.getResponseBody());
 
-			code= jsonObject.getString("Code");
+			code = jsonObject.getString("Code");
+			JSONArray ls = jsonObject.getJSONArray("ReceivingOrders");
+			if(ls!=null&& !ls.isEmpty()){
+				JSONObject t = ls.getJSONObject(0);
+				if(t!=null){
+					JSONObject endWarehouse = t.getJSONObject("EndWarehouse");
+					endWarehouseName = endWarehouse.getString("Name");
+				}
+			}else{
+				log.error("############没有收货单oid:{}", key);
+				return key;
+			}
 
-		}else{
+		} else {
 			packageEntity.setPackageStatus(5);
 			factoryPackageService.updateById(packageEntity);
-			 code =packageEntity.getCode();
+			code = packageEntity.getCode();
+
+			Long orderId = packageEntity.getOrderId();
+			// 查询 订单
+			QueryWrapper<FactoryOrderEntity> queryWrapperFactoryOrderEntity = new QueryWrapper<>();
+			queryWrapperFactoryOrderEntity.eq("id", orderId);
+			FactoryOrderEntity orderEntity = factoryOrderService.getOne(queryWrapperFactoryOrderEntity);
+			// 查询 发货单
+			Long receivingId = orderEntity.getReceivingId();
+			ReceivingOrderEntity receivingEntity = receivingOrderMapper.selectById(receivingId);
+			endWarehouseName = receivingEntity.getEndWarehouseName();
+		}
+
+
+		// 判断 作业仓库 和 收货仓库 是否一致
+		log.info(" >>>> 判断作业仓库 和 收货仓库 是否一致 >>>> 作业仓库：{}，收货仓库：{}", warehouseName, endWarehouseName);
+		if (!warehouseName.equals(endWarehouseName)) {
+			return key;
 		}
 
 
 		JSONObject jo = new JSONObject();
-		jo.put("orderPackageCode",code);
-		jo.put("warehouse_name",warehouseName);
+		jo.put("orderPackageCode", code);
+		jo.put("warehouse_name", warehouseName);
 
 		//真正的处理需要的数据
 		Map<String, Object> map = new HashMap<>();
@@ -181,14 +208,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	}
 
 
-
-
-
-
 	@Override
 	public String saveOuPaiOutGoingOrderByCode(String orderCode, Integer event) {
 		//
-		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/OutGoingOrder?$filter=Code eq '"+orderCode+"'" +
+		String url = ouPaiProperties.getUri() + "tims_odata_api/api/odata/OutGoingOrder?$filter=Code eq '" + orderCode + "'" +
 			"&$select=Code,Status,Truck,DriverPhone,Platform,DeliveryDate,Creator,CreateTime,IsAdjust,SendTime," +
 			"Customers,Volume" +
 			"&$expand=Warehouse($select=Code,Name)" +
@@ -341,11 +364,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			log.info("############handleData: 数据处理开始");
 			analyzeData(resultArray);
 			opOrderStatusLogEntity.setDataStatus(1);
-		} catch (CustomerException e) {
-			log.error(">>>> error {}", e.getMessage());
-			opOrderStatusLogEntity.setDataStatus(2);
-
-		}catch (Exception e) {
+		} catch (Exception e) {
 			log.error(">>>> error {}", e.getMessage());
 			opOrderStatusLogEntity.setDataStatus(2);
 
@@ -358,7 +377,7 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	 *
 	 * @param resultArray
 	 */
-	private void analyzeData(JSONArray resultArray) {
+	public void analyzeData(JSONArray resultArray) {
 		Date start = new Date();
 		for (int i = 0; i < resultArray.size(); i++) {
 			JSONObject valueObject = resultArray.getJSONObject(i);
@@ -376,8 +395,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			String type = valueObject.getString("Type");
 			if ("中转".equals(type)) {
 				receivingOrderEntity.setType(1);
-				log.warn("############handleData: 中转到货暂不接收");
-				throw new CustomerException(403,"中转到货暂不接收");
+//				log.warn("############handleData: 中转到货暂不接收");
+//				throw new CustomerException(403, "中转到货暂不接收");
 			} else if ("配送".equals(type)) {
 				receivingOrderEntity.setType(2);
 			} else {
diff --git a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
index c010aee30..5761c873c 100644
--- a/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
+++ b/blade-service/logpm-factory/src/test/java/com/logpm/factory/TestService.java
@@ -29,6 +29,7 @@ import com.logpm.factory.oupai.entity.FactoryPackageEntity;
 import com.logpm.factory.oupai.entity.OpOrderStatusLogEntity;
 import com.logpm.factory.oupai.service.IFactoryPackageService;
 import com.logpm.factory.oupai.service.IOuPaiFactoryService;
+import com.logpm.factory.oupai.service.impl.OuPaiFactoryServiceImpl;
 import com.logpm.factory.pan.service.IPanFactoryDataService;
 import com.logpm.factory.snm.vo.MTOrderPackageRelationVO;
 import com.logpm.oldproject.entity.AdvanceDetailEntity;
@@ -84,6 +85,10 @@ public class TestService {
 	@Autowired
 	private IOssClient ossClient;
 
+
+	@Autowired
+	private OuPaiFactoryServiceImpl ouPaiFactoryService;
+
 	@Test
 	public void test2() {
 //		ouPaiFactoryService.findOuPaiFactoryOrderDTOByCarCarNumber("LCD230505047");
@@ -298,6 +303,30 @@ public class TestService {
 
 
 
+	}
+
+	@Test
+	public void test7() throws IOException {
+
+		File file = new File("F://cb3e1338fb5944ad06be8bfcaa013da7.log");
+
+		BufferedReader reader = new BufferedReader(new FileReader(file));
+
+		StringBuffer sb = new StringBuffer();
+
+		while (true) {
+			String ms = reader.readLine();
+			if (StringUtil.isBlank(ms)) {
+				break;
+			}
+			sb.append(ms);
+		}
+		JSONObject object = JSONObject.parseObject(sb.toString());
+		JSONArray resultArray = object.getJSONArray("value");
+
+		ouPaiFactoryService.analyzeData(resultArray);
+
+
 	}
 
 }
diff --git a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
index c976a6437..05eb39fcd 100644
--- a/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
+++ b/blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml
@@ -81,7 +81,7 @@
             cast (wb.warehouse_id as char) destinationWarehouseId,
             wb.take_company takeCompany
         FROM ht_advance_detail d
-                 left join ht_waybill_order wo on wo.advance_id = d.advance_id and wo.delete_time = 0
+                 left join ht_waybill_order wo on wo.advance_id = d.advance_id and wo.delete_time = 0 and wo.status!=-1
                  left join ht_way_bill wb on wb.id = wo.way_bill_id and wb.delete_time = 0
         where d.unitNo = #{unitNo}
     </select>