From 5341de25b79b48ae0a597bdf8e64952aab28ff52 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 21 Sep 2023 18:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/basicdata/feign/BasicdataClientClient.java     | 2 +-
 .../distribution/mapper/DistributionStockListMapper.java     | 2 +-
 .../distribution/mapper/DistributionStockListMapper.xml      | 4 +++-
 .../distribution/service/IDistributionStockListService.java  | 4 +++-
 .../service/impl/DistributionStockListServiceImpl.java       | 4 ++--
 .../service/impl/DistributionStockupServiceImpl.java         | 2 +-
 .../service/impl/WarehouseWarehousingEntryServiceImpl.java   | 5 +++++
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
index def091160..27df74000 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataClientClient.java
@@ -75,7 +75,7 @@ public class BasicdataClientClient implements IBasicdataClientClient {
 	public BasicdataClientEntity getCustomer(String customerName, String customerCode) {
 		return basicdataClientService.getOne(Wrappers.<BasicdataClientEntity>query().lambda()
 			.eq(StringUtils.isNotEmpty(customerName),BasicdataClientEntity::getClientName,customerName)
-			.eq(StringUtils.isNotEmpty(customerCode),BasicdataClientEntity::getReserve1,customerCode)
+			.eq(StringUtils.isNotEmpty(customerCode),BasicdataClientEntity::getClientCode,customerCode)
 		);
 	}
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
index 1adf5ae3e..25668ae01 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java
@@ -81,7 +81,7 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
 
 	List<DistributionStockListEntity> getEntityByMarketIdAndMaterialName(@Param("marketId") Long marketId, @Param("materialName") String materialName, @Param("warehouseId") Long warehouseId);
 
-    DistributionStockupStockListInfoVO selectStockListInfoSelf(@Param("reservationId") Long reservationId,@Param("stockListId") Long stockListId);
+    DistributionStockupStockListInfoVO selectStockListInfoSelf(@Param("reservationId") Long reservationId,@Param("stockListId") Long stockListId,@Param("allocationId") Long allocationId);
 
 
 	List<DistributionStockListEntity> getListByMarketIdAndMaterialName(@Param("marketId") Long marketId, @Param("materialName") String materialName, @Param("warehouseId") Long warehouseId);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
index d0f08714c..3df680d2e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml
@@ -285,7 +285,9 @@
     <select id="selectStockListInfoSelf"  resultType="com.logpm.distribution.vo.DistributionStockupStockListInfoVO">
         select lddd.bill_lading_id reservationId,
                lddd.stock_list_id stockListId,
-               ldsl.storage_location warehouseArea,
+        (select DISTINCT allocation_title
+        from logpm_warehouse_updown_goods
+        where allocation_id = #{allocationId}) warehouseArea,
                ldsl.tray_name trays,
                ldsl.sku sku,
                ldsl.cargo_unit unit,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java
index d4226fef0..920029894 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java
@@ -124,11 +124,13 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 
 	/**
 	 * 自提查询库存品数据
+	 *
 	 * @param reservationId
 	 * @param stockListId
+	 * @param allocationId
 	 * @return
 	 */
-    DistributionStockupStockListInfoVO selectStockListInfoSelf(Long reservationId, Long stockListId);
+    DistributionStockupStockListInfoVO selectStockListInfoSelf(Long reservationId, Long stockListId,Long allocationId);
 
 	List<DistributionStockListEntity> getListByMarketIdAndMaterialName(Long marketId, String materialName, Long warehouseId);
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
index b89dfeb48..f6bea42e7 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java
@@ -379,8 +379,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	}
 
 	@Override
-	public DistributionStockupStockListInfoVO selectStockListInfoSelf(Long reservationId, Long stockListId) {
-		return baseMapper.selectStockListInfoSelf(reservationId,stockListId);
+	public DistributionStockupStockListInfoVO selectStockListInfoSelf(Long reservationId, Long stockListId, Long allocationId) {
+		return baseMapper.selectStockListInfoSelf(reservationId,stockListId,allocationId);
 	}
 
 	@Override
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 958982cb1..12d33f7a8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -1289,7 +1289,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public DistributionStockupStockListInfoVO selectStockListInfoSelf(Long reservationId, Long stockListId, Long allocationId) {
 
-		DistributionStockupStockListInfoVO entity = distributionStockListService.selectStockListInfoSelf(reservationId, stockListId);
+		DistributionStockupStockListInfoVO entity = distributionStockListService.selectStockListInfoSelf(reservationId, stockListId,allocationId);
 		List<StockListInfoListVO> list = distributionStockListService.selectStockListInfoSelfList(reservationId, stockListId);
 		entity.setStockList(list);
 		return entity;
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index 2c685df3f..7ce1026fb 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -400,6 +400,11 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			R<List<DictBiz>> distriType = dictBizClient.getList("distribution_type");
 			if(ObjectUtils.isNotNull(distriType)){
 				List<DictBiz> data1 = distriType.getData();
+//				data1.forEach( a ->{
+//					if(o.getServiceType().equals(a.getDictValue())){
+//						entryEntity.setServiceType(a.getDictKey()); //仓库名称
+//					}
+//				});
 				DictBiz dictBiz = data1.stream().filter(da -> {
 					return o.getServiceType().equals(da.getDictValue());
 				}).findAny().get();