From 0384a842410afac8c9be24295e0be4cee2fe1b10 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 11 Jul 2024 10:22:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9E=E7=95=99=E7=BB=B4=E6=8A=A4=E5=8C=85?=
 =?UTF-8?q?=E4=BB=B6=E7=89=A9=E6=96=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryListMapper.xml     | 2 ++
 .../service/impl/DistributionDeliveryListServiceImpl.java      | 3 +++
 .../logpm/warehouse/mapper/WarehouseRetentionScanMapper.xml    | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
index 1f6ec2c34..f0a763a7d 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml
@@ -2027,6 +2027,8 @@
 			ldpl.quantity AS retentionQuantity,
 			1 AS conditions,
             ldpl.waybill_number AS waybillNumber,
+            ldpl.material_name AS materialName,
+            ldpl.material_code AS materialNumber,
             ldpl.waybill_id AS waybillId,
             ldpl.order_package_status AS orderPackageStatus,
             ldpl.warehouse_id AS warehouseId,
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 7d57ee7fa..d8b12076e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -6009,6 +6009,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							retentionScanVo.setConditions(1);
 							retentionScanVo.setScanType(1);
 							retentionScanVo.setRetentionQuantity(1);
+							retentionScanVo.setRetentionQuantity(1);
 							retentionScanVo.setOrderPackageId(distributionLoadscanEntity.getPackageId());
 							//查询包件
 							DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanEntity.getPackageId());
@@ -6016,6 +6017,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							retentionScanVo.setOrderPackageStatus(parcelListEntity.getOrderPackageStatus());
 							retentionScanVo.setOrderPackageCode(parcelListEntity.getOrderPackageCode());
 							retentionScanVo.setWaybillNumber(parcelListEntity.getWaybillNumber());
+							retentionScanVo.setMaterialName(parcelListEntity.getMaterialName());
+							retentionScanVo.setMaterialNumber(parcelListEntity.getMaterialCode());
 							retentionScanVo.setWaybillId(parcelListEntity.getWaybillId());
 							DistributionReservationEntity reservationEntity = distributionReservationMapper.selectById(distributionLoadscanEntity.getReservationId());
 							retentionScanVo.setReservationCode(reservationEntity.getReservationCode());
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionScanMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionScanMapper.xml
index 7330ce208..9cfeb6e64 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionScanMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseRetentionScanMapper.xml
@@ -41,7 +41,7 @@
 
 
     <select id="selectWarehouseRetentionRecordPage" resultMap="warehouseRetentionRecordResultMap">
-        select * from logpm_warehouse_retention_scan where is_deleted = 0
+        select * from logpm_warehouse_retention_scan where is_deleted = 0 ORDER BY create_time DESC
     </select>