Merge branch 'pre-production'

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java

@@ -50,8 +50,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 	private final IMtFactoryOrderService mtFactoryOrderService;
 
 	private final IMtPackageInfoService mtPackageInfoService;
-	private final IAdvanceDetailClient advanceDetailClient;
-	private final IWarehouseClient warehouseClient;
+
 
 	private final BladeRedis bladeRedis;
 
@@ -125,7 +124,7 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService {
 					}
 				}
 				//判断是否有新的包件
-				if (packageInfos.size() == 0) {
+				if (packageInfos.isEmpty()) {
 					//如果没有新增包件就直接下一条数据
 					log.info("##################dealWithData: 没有新增包件，所以当前数据不保存 invoiceOrderCode={}", invoiceOrderCode);
 					continue;

blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/service/impl/OuPaiFactoryServiceImpl.java

@@ -101,11 +101,15 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 		QueryWrapper<FactoryPackageEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("oid",orderPackageCode);
 		FactoryPackageEntity packageEntity = factoryPackageService.getOne(queryWrapper);
+		if(Objects.isNull(packageEntity)) {
+			log.error("############oid 查询数据失败: {}",orderPackageCode);
+			return orderPackageCode;
+		}
 		packageEntity.setPackageStatus(5);
 		factoryPackageService.updateById(packageEntity);
 
 		JSONObject jo = new JSONObject();
-		jo.put("orderPackageCode",orderPackageCode);
+		jo.put("orderPackageCode",packageEntity.getCode());
 		jo.put("receivingTime",CommonUtil.dateToString(packageEntity.getUpdateTime()));
 
 		//真正的处理需要的数据