Merge branch 'dev' into pre-production

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -37,7 +37,6 @@ import com.logpm.factory.snm.entity.PanPackageInfo;
 import com.logpm.factory.snm.entity.PanPackageList;
 import com.logpm.oldproject.entity.AdvanceDetailEntity;
 import com.logpm.oldproject.entity.AdvanceEntity;
-import com.logpm.oldproject.entity.OrderDetailEntity;
 import com.logpm.oldproject.entity.WayBillEntity;
 import com.logpm.oldproject.feign.*;
 import com.logpm.oldproject.vo.DistributionParcelListEntityVO;
@@ -574,6 +573,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 		DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo);
 //		WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo);
 
+		if(Objects.isNull(vo)){
+			logger.warn("##############saveOrderPackage: 未在老系统查询到包件数据 unitNo={}",unitNo);
+		}else{
 			DistributionParcelListEntity entity = new DistributionParcelListEntity();
 			BeanUtil.copyProperties(vo, entity);
 			entity.setOrderPackageCode(vo.getPacketBarCode());
@@ -629,6 +631,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				throw new CustomerException(405, "保存包件信息失败");
 			}
 		}
+	}
 
 	private void saveWaybillEntity(String waybillNo) {
 		logger.info("#################handleDataToPlatform.saveWaybillEntity: {}", waybillNo);