From 2828968be5dbb81ff143a7f032104c116c437b86 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Fri, 3 Nov 2023 14:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=AC=A7=E6=B4=BE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=A8=E9=80=81=E7=9A=84=E4=BB=93=E5=BA=93ID1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oupai/service/impl/OuPaiFactoryServiceImpl.java    | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 1d3315235..968d450f2 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
@@ -362,6 +362,16 @@ public class OuPaiFactoryServiceImpl implements IOuPaiFactoryService {
 			return Resp.fail(400, "未查询到该单据推送收货单信息");
 		}
 
+		if(StringUtil.isBlank(receivingOrderEntity.getCurrentWarehouseOid())){
+			log.info(" 该订单为没有收货仓 不进行推送  >>> getCurrentWarehouseOid={}  ", receivingOrderEntity.getCurrentWarehouseOid());
+			return Resp.fail(400, "收货仓信息不能为null");
+		}
+		if(!receivingOrderEntity.getCurrentWarehouseName().contains("仓")){
+			log.info(" 该订单为没有收货仓信息不正确 getCurrentWarehouseName={}  ", receivingOrderEntity.getCurrentWarehouseName());
+			return Resp.fail(400, "该订单为没有收货仓信息不正确");
+		}
+
+
 		JSONObject detailObject = new JSONObject();
 		detailObject.put("WarehouseOid", receivingOrderEntity.getCurrentWarehouseOid());
 		detailObject.put("WarehouseBelong", "oppein");