From 3263a781bd48f9613c976410ce54290b921b4fbc Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 9 Jan 2024 11:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=89=E6=8B=A9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E3=80=81=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=8F=96=E6=B6=88=E4=BF=AE=E6=94=B9=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionStockArticleMapper.xml      | 2 ++
 .../service/impl/DistributionReservationPackageServiceImpl.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
index 5e3f881a2..80a15a841 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml
@@ -676,6 +676,8 @@
                 and ldsa.customer_address  like concat('%',#{par.customerAddress},'%')
             </if>
         </where>
+        ORDER BY
+        ldsa.warehouse_entry_time DESC
     </select>
     <select id="selectListGrounding" resultType="com.logpm.distribution.vo.DistributionStockArticleGroundingVO">
         select ldsa.grounding_status groundingStatus,lwtg.association_type associationType,lwtg.tray_id trayId,lwtg.tray_code trayCode,ldsa.id stockArticleId
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
index 7f594cf85..28cbf3e0b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationPackageServiceImpl.java
@@ -37,6 +37,7 @@ import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.order.OrderReservationStatusConstant;
+import org.springblade.common.constant.orderpackage.OrderPackageReservationStatusConstant;
 import org.springblade.common.constant.orderpackage.OrderPackageStatusConstant;
 import org.springblade.common.constant.reservation.ReservationPackageStatusConstant;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -182,6 +183,7 @@ public class DistributionReservationPackageServiceImpl extends BaseServiceImpl<D
 		//取消配送  该包件进入可配送状态
 		DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 		parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
+		parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 		parcelListEntity.setId(packageId);
 		parcelListService.updateById(parcelListEntity);
 		//此包件对应的订单预约数量维护