From cad1b9577e2a17de1d45a8b01e6b7c78c566a8a9 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Sat, 22 Jul 2023 15:06:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E7=9A=84=E6=9C=8D=E5=8A=A1=E6=9C=8D=E5=8A=A1=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8C=E4=B9=8B=E5=89=8D=E6=98=AF=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E4=BD=8D=E8=BF=9B=E8=A1=8C=E6=8C=87?=
 =?UTF-8?q?=E6=B4=BE=E6=9C=8D=E5=8A=A1=E4=BB=93=E5=BA=93=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E4=BF=AE=E6=94=B9=E6=8C=89=E7=85=A7=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E4=BB=93=E6=9D=A5=E8=BF=9B=E8=A1=8C=E5=AF=B9=E5=BA=94=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicdataStorageServicesEntity.java       | 20 +++++++++++++------
 .../BasicdataStorageServicesServiceImpl.java  |  4 ++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
index 1c265ce8d..8e1a35c50 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java
@@ -72,16 +72,24 @@ public class BasicdataStorageServicesEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "区分类型")
 	private Integer distinguish;
+
 	/**
-	 * 发货单位
+	 * 服务仓库
 	 */
-	@ApiModelProperty(value = "发货单位")
-	private String forwardingUnit;
+	@ApiModelProperty(value = "服务仓库ID")
+	private String serveWarehouseId;
+	@ApiModelProperty(value = "服务仓库Name")
+	private String serveWwarehouseName;
+
+
 	/**
-	 * 服务仓库
+	 * 发货仓库 发货仓库客户允许未null
 	 */
-	@ApiModelProperty(value = "服务仓库")
-	private String warehouseService;
+	@ApiModelProperty(value = "发货仓库ID")
+	private String sendWarehouseId;
+	@ApiModelProperty(value = "发货仓库Name")
+	private String sendWarehouseName;
+
 
 	/**
 	 * 门店ID
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
index 7513f179a..88478b90b 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
@@ -60,8 +60,8 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 
 		List<BasicdataStorageServicesEntity> basicdataStorageServicesEntities = baseMapper.selectList(Wrappers.<BasicdataStorageServicesEntity>query().lambda().
 			eq(BasicdataStorageServicesEntity::getShopId, basicdataStorageServices.getShopId()).
-			eq(BasicdataStorageServicesEntity::getForwardingUnit, basicdataStorageServices.getForwardingUnit()).
-			eq(BasicdataStorageServicesEntity::getWarehouseService, basicdataStorageServices.getWarehouseService())
+			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId()).
+			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId())
 		);
 		if(basicdataStorageServicesEntities.size() > 0){
 			throw new RuntimeException("存在重复数据！已拒绝！！");