From 27b9147744d15265c4053e32188a555347baab71 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 2 Aug 2023 18:29:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=A4=87=E8=B4=A7PDA?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionStockupAppController.java             |  3 ++-
 .../mapper/DistributionStockListMapper.xml            |  4 ++--
 .../mapper/DistributionStockupMapper.java             |  2 +-
 .../distribution/mapper/DistributionStockupMapper.xml | 11 +++++++++++
 .../service/IDistributionStockupService.java          |  1 +
 .../service/impl/DistributionStockupServiceImpl.java  |  5 +++++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index 72078d567..a1cc2a66e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -102,7 +102,8 @@ public class DistributionStockupAppController extends BladeController {
 
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
 		map.put("consignee",reservationEntity.getConsignee());
-		map.put("goodsAreaName",reservationEntity.getGoodsAreaName());
+		String stockupArea = distributionStockupService.selectStockupAreaByReservationId(reservationEntity.getId());
+		map.put("goodsAreaName",stockupArea);
 		if(orderStatus.equals(1)) {
 			//查询客户订单对应的
 			List<DistributionStockupOrderListVO> list = distributionStockupService.selectStockupOrderList(stockupDTO);
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 2aff5b83e..a1a2f4696 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
@@ -104,7 +104,7 @@
                ldsl.storage_location warehouseArea,
                ldsl.tray_name trays,
                ldsl.sku sku,
-               ldsl.unit unit,
+               ldsl.cargo_unit unit,
                count(s.id) scanNum
         from logpm_distribution_reservation ldr
                  left join logpm_distribution_reservation_stocklist ldrs on ldrs.reservation_id = ldr.id and ldrs.is_deleted = 0
@@ -120,7 +120,7 @@
                  ldsl.storage_location,
                  ldsl.tray_name,
                  ldsl.sku,
-                 ldsl.unit
+                 ldsl.cargo_unit
 
     </select>
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
index 9730c3be9..039b50955 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.java
@@ -28,7 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 备货信息表 Mapper 接口
@@ -111,4 +110,5 @@ public interface DistributionStockupMapper extends BaseMapper<DistributionStocku
 	 */
 	DistributionStockupVO getDeliveryStockupInfo(@Param("id")String id);
 
+	String selectStockupAreaByReservationId(@Param("reservationId") Long id);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index f35fde8a3..1de9aee2f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -244,4 +244,15 @@
             ldsi.stockup_id =#{id}
         </where>
     </select>
+
+
+    <select id="selectStockupAreaByReservationId" resultType="String">
+        select lwga.headline
+        from logpm_distribution_stockup_info ldsi
+        left join logpm_distribution_stockup lds on lds.id = ldsi.stockup_id and lds.is_deleted = 0
+        left join logpm_warehouse_goods_area lwga on lwga.id = lds.goods_area_id and lwga.is_deleted = 0
+        where ldsi.reservation_id = #{reservationId}
+        and ldsi.is_deleted = 0
+    </select>
+
 </mapper>
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
index a594e5b28..16bba6866 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java
@@ -100,4 +100,5 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 
 	List<String> createPackageCode(Long reservationId, Long stockListId, Integer packageNum);
 
+	String selectStockupAreaByReservationId(Long id);
 }
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 d46b347e1..f4af41fc9 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
@@ -432,4 +432,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		return ls;
 	}
 
+	@Override
+	public String selectStockupAreaByReservationId(Long id) {
+		return baseMapper.selectStockupAreaByReservationId(id);
+	}
+
 }