From f373696ed78502cb53f224845e942dd67bcf2b0c Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 12 Jun 2024 09:43:29 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/DistrilbutionBillLadingClient.java      |  2 +-
 .../service/IDistrilbutionBillLadingService.java  |  3 +++
 .../impl/DistrilbutionBillLadingServiceImpl.java  | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistrilbutionBillLadingClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistrilbutionBillLadingClient.java
index 18625cb04..430c2c1b9 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistrilbutionBillLadingClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistrilbutionBillLadingClient.java
@@ -61,7 +61,7 @@ public class DistrilbutionBillLadingClient implements IDistrilbutionBillLadingCl
 	@Override
 	public Boolean sendFactorySignforInfo(String ids) {
 		for (String string : ids.split(",")) {
-			distributionAsyncService.sendFactorySignforInfo(string);
+			distrilbutionBillLadingService.sendFactory(string);
 		}
 		return null;
 	}
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java
index 67574cdbf..796990e5d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistrilbutionBillLadingService.java
@@ -276,4 +276,7 @@ public interface IDistrilbutionBillLadingService extends BaseService<Distrilbuti
 	 * @return
 	 */
 	R getBillLadingPackageIds(Long id,Long orderId);
+
+
+    void sendFactory(String string);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 647f705bb..04481f08f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -1174,6 +1174,21 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		return R.data(list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList()));
 	}
 
+	@Override
+	public void sendFactory(String string) {
+		List<Long> list = Func.toLongList(string);
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if (Func.isEmpty(myCurrentWarehouse)){
+			log.error("自提推送工厂为进行仓库选择?>>>>>>>>>>>>>>>>>>>>warehouse:{}",myCurrentWarehouse);
+		}
+		if (!list.isEmpty()) {
+			for (Long l : list) {
+				distributionAsyncService.sendFactorySignforInfo(l,myCurrentWarehouse,AuthUtil.getUser());
+
+			}
+		}
+	}
+
 	/**
 	 * 转换老系统的ID
 	 *