From 2ed6b6dedd719105ef0337406ab977e8ef0d1c06 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Mon, 18 Dec 2023 21:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DistributionParcelListMapper.xml   | 49 ++++++++-----------
 .../impl/DistributionAsyncServiceImpl.java    |  1 +
 2 files changed, 21 insertions(+), 29 deletions(-)

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 0b350a944..d27b9d7a2 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
@@ -748,25 +748,25 @@
     </select>
     <select id="selectStockListByOderId" resultType="com.logpm.distribution.vo.DistributionStockListVO">
         SELECT
-        ldsl.id id,
-        ldsl.incoming_batch incomingBatch,
-        ldsl.market_name marketName,
-        ldsl.service_type serviceType,
-        ldsl.service_number serviceNumber,
-        ldsl.description_goods descriptionGoods,
-        ldsl.cargo_number cargoNumber,
-        ldsl.quantity_stock quantityStock ,
-        lwtg.tray_code trayCode,
-        lwug.position_code positionCode
-        FROM
-        logpm_distribution_stock_list ldsl
-        JOIN   logpm_distribution_parcel_list ldpl  ON ldpl.id = ldsl.parcel_list_id
-        left JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
-        AND lwug.incoming_batch = ldsl.incoming_batch
-        AND ldsl.market_id = lwug.market_id
-        LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldsl.material_id
-        AND lwtg.incoming_batch = ldsl.incoming_batch
-        AND ldsl.market_id = lwtg.market_id
+        ldpl.id AS id,
+        ldpl.order_package_code AS orderPackageCode,
+        ldpl.warehouse AS warehouse,
+        ldpl.firsts AS firsts,
+        ldpl.SECOND AS SECOND,
+        ldpl.third_product AS thirdProduct,
+        ldpl.material_code AS cargoNumber,
+        ldpl.material_name AS descriptionGoods,
+        ldpl.order_package_status AS orderPackageStatus,
+        ldpl.conditions,
+        lwtg.tray_code AS trayCode,
+        lwug.position_code AS positionCode ,
+        ldsa.mall_name as marketName
+        from
+        logpm_distribution_stock_article ldsa
+        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.stock_article_id=ldsa.id
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
+
+        LEFT JOIN logpm_warehouse_tray_goods lwtg ON lwtg.association_id = ldpl.id
         <where>
             ldpl.stock_article_id = #{id} and ldpl.conditions =2
             <if test="collect != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(collect)">
@@ -776,16 +776,7 @@
                 </foreach>
             </if>
         </where>
-        GROUP BY
-        ldsl.id,
-        ldsl.incoming_batch,
-        ldsl.market_name,
-        ldsl.service_type,
-        ldsl.service_number,
-        ldsl.description_goods,
-        ldsl.cargo_number,
-        lwtg.tray_code,
-        lwug.position_code;
+
     </select>
     <select id="exportDistributionParcelList"
             resultType="com.logpm.distribution.excel.DistributionParcelListExcel">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index e0cd1404c..13b003d22 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1342,6 +1342,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	@Override
 	public void updatepackageListLoadingStatus(List<DistributionParcelListEntity> updatePackageList,Long warehouseId) {
 		List<Long> packageIds = updatePackageList.stream().map(DistributionParcelListEntity::getId).collect(Collectors.toList());
+
 		Integer i = distributionParcelListMapper.updatePackageListByIds(packageIds);
 		String collect = updatePackageList.stream().map(DistributionParcelListEntity::getOrderPackageCode).collect(Collectors.joining(","));