From 701f0f77db800d65e89817e1c6aed82c3dd01816 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 10 Jan 2024 15:04:51 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=81=E7=AD=BE=E6=94=B6=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/distribution/mapper/DistributionSignforMapper.xml  | 5 ++---
 .../service/impl/DistributionSignforServiceImpl.java         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
index 3b32788f3..a18a2284c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSignforMapper.xml
@@ -834,9 +834,9 @@
                     <if test="param.taskTime_start!=null and param.taskTime_start!=''">
                         and date_format(lddl.task_time,'%y%m%d%') >= date_format(#{param.taskTime_start},'%y%m%d%') and date_format(lddl.task_time,'%y%m%d%') &lt;= date_format(#{param.taskTime_end},'%y%m%d%')
                     </if>
-
                 </where>
-            </select>
+        ORDER BY lddl.task_time  DESC
+    </select>
             <select id="selectAppDeliveryInventoryPage" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
                 SELECT
                 distinct ldsl.id id,
@@ -909,7 +909,6 @@
             AND ldl.scan_status != 1
             AND ldl.signfor_state = 2) !=0
         </where>
-
     </select>
     <select id="selectordb" resultType="com.logpm.distribution.vo.app.DistributionAppStockArticleVO">
         SELECT distinct
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 6f2420aaf..4e03feda0 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -1873,7 +1873,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if ( reservationNum == signingTotal.get()) {
 			//这里就是齐套
 			builder.setLength(0);
-			builder.append("齐套");
+			builder.append("签收扫描完成");
 		}
 		return builder.toString();
 	}