From 24d6e7f10c8a676a75e78902d23cb76b1d130c3b Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 20 Sep 2023 18:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=87=AA=E6=8F=90=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/vo/PackageStockupVO.java   |  1 +
 .../mapper/DistributionParcelListMapper.xml       | 15 ++++++---------
 .../impl/DistributionStockupServiceImpl.java      |  3 ++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java
index ab5ad4865..25d9be4dd 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/PackageStockupVO.java
@@ -28,6 +28,7 @@ public class PackageStockupVO implements Serializable {
 	private String materialName;//物料名称
 	private String trayCode;//托盘名称
 	private String allocationTitle;//货位名称
+	private String allocationTitles;//货位名称
 
 	private Long scanId;//扫码记录id
 	private Long allocationId;//货位id
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index ac4172d1d..211bd4408 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -138,17 +138,12 @@
     </select>
     <select id="selectOrderInfoAllocationList" resultType="com.logpm.distribution.vo.PackageStockupVO">
         select DISTINCT ldpl.order_code orderCode,ldpl.order_package_code packageBarCode,ldpl.conditions goodsType,ldpl.material_name materialName,
-        CASE WHEN lds.id IS NULL THEN 0 ELSE 1 END AS isScan,ldpl.id parceListId,(
-        select GROUP_CONCAT( DISTINCT position_code)
-        from logpm_warehouse_updown_goods_log
-        where association_id = ldpl.id
-        ) positionCode,lwug.allocation_id allocationId
+        CASE WHEN lds.id IS NULL THEN 0 ELSE 1 END AS isScan,ldpl.id parceListId,GROUP_CONCAT(lds.allocation_title) positionCode,lds.allocation_id allocationId
         from logpm_distribution_parcel_list ldpl
         LEFT JOIN logpm_distribution_stock lds on lds.parcel_list_id = ldpl.id
-        LEFT JOIN logpm_warehouse_updown_goods_log lwug on lwug.association_id = ldpl.id
         <where>
-            <if test="param.allocationId != null and param.allocationId != ''"> and lwug.allocation_id = #{param.allocationId} </if>
-            <if test="param.allocation != null and param.allocation != ''"> and lwug.position_code = #{param.allocation} </if>
+            <if test="param.allocationId != null and param.allocationId != ''"> and lds.allocation_id = #{param.allocationId} </if>
+            <if test="param.allocation != null and param.allocation != ''"> and lds.allocation_title = #{param.allocation} </if>
             <if test="param.stockArticleId != null and param.stockArticleId != ''">and ldpl.stock_article_id = #{param.stockArticleId} </if>
             <if test="param.stockArticleIdList != null ">
                and ldpl.stock_article_id in
@@ -157,6 +152,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY ldpl.order_code ,ldpl.order_package_code ,ldpl.conditions  ,ldpl.material_name,lds.id,ldpl.id
     </select>
     <select id="selectOrderInfoSelfList" resultType="com.logpm.distribution.vo.PackageStockupVO">
         select DISTINCT ldpl.order_code orderCode,ldpl.order_package_code packageBarCode,ldpl.conditions goodsType,ldpl.material_name materialName,
@@ -254,7 +250,8 @@
           and ldpl.pallet = #{pallet}
           and ldr.is_deleted = 0 -->
         select DISTINCT ldpl.order_code orderCode,ldpl.order_package_code packageBarCode, 1 goodsType,ldrp.parce_list_id parceListId,ldpl.material_name materialName,
-        lwug.allocation_title allocationTitle,lwtg.tray_code trayCode,lwug.position_code positionCode,lwug.allocation_id allocationId,lds.id stockId,lds.stockup_id stockupId
+        lwug.allocation_title allocationTitle,lwtg.tray_code trayCode,lwug.position_code positionCode,lwug.allocation_id allocationId,lds.id stockId,lds.stockup_id stockupId,
+        lds.allocation_title allocationTitles
         from logpm_distribution_reservation_package ldrp
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldrp.parce_list_id = ldpl.id
         LEFT JOIN logpm_warehouse_tray_goods lwtg on lwtg.association_id =ldrp.parce_list_id and lwtg.association_type = '3'
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 76d4ccd59..320c69354 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
@@ -855,7 +855,8 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		}else{
 			//没有下架
 			List<PackageStockupVO> packageStockupVOS = distributionParcelListService.selectOrderInfoList(stockupDTO);
-			list = packageStockupVOS.stream().filter(o -> ObjectUtils.isNull(o.getStockId())).collect(Collectors.toList());
+//			list = distributionParcelListService.selectOrderInfoList(stockupDTO);
+			list = packageStockupVOS.stream().filter(o -> ObjectUtils.isNull(o.getAllocationTitles())).collect(Collectors.toList());
 
 		}