fix: 修改欧派回传逻辑

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

@@ -424,9 +424,10 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 
 	/**
 	 * 重推
-	 * @see #handleStatusData(OrderStatusDTO, boolean)
+	 *
 	 * @param orderStatusDTO
 	 * @return
+	 * @see #handleStatusData(OrderStatusDTO, boolean)
 	 */
 	@Override
 	public boolean retryHandleStatusData(OrderStatusDTO orderStatusDTO) {
@@ -437,7 +438,6 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 	}
 
 	/**
-	 *
 	 * @param orderStatusDTO
 	 * @param isRetry        是否是重推调用
 	 * @return
@@ -453,6 +453,33 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			return Resp.fail(400, "当前数据的状态不推送");
 		}
 
+
+		// 需要判断当前操作的码 是否是和包码
+		LambdaQueryWrapper<FactoryPackageEntity> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(FactoryPackageEntity::getCosourcingCode, unitNo);
+		List<FactoryPackageEntity> list = factoryPackageService.list(queryWrapper);
+		if (list.isEmpty()) {
+			return doPackageInfo(orderStatusDTO, isRetry, unitNo, status);
+		} else {
+			try {
+				for (FactoryPackageEntity factoryPackageEntity : list) {
+
+					R r = doPackageInfo(orderStatusDTO, isRetry, factoryPackageEntity.getCode(), status);
+
+				}
+			} catch (Exception e) {
+				log.error("合包码推送出现异常", e);
+			}
+			return Resp.success("物流状态传递成功");
+
+
+		}
+
+
+	}
+
+	@NotNull
+	private R doPackageInfo(OrderStatusDTO orderStatusDTO, boolean isRetry, String unitNo, String status) {
 		//继续判断是否到达目的仓
 		String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id
 		//查询destinationWarehouse logiBillNo plantId数据
@@ -635,6 +662,8 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 //			return Resp.fail(400, "不是目的仓");
 //		}
 
+
+
 		// 查询这个包件对应到新系统的订单
 		FactoryOrderEntity factoryOrder = factoryOrderService.selectEntityByOrderPackageCode(unitNo);