From 45893b5be857c034467d7069cf41a9905b369691 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 26 六月 2026 11:01:19 +0800
Subject: [PATCH] fix: 报价日期倒序,发货台账返回宽、高和数量

---
 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
index 5bda4f6..584ee1c 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -16,6 +16,7 @@
         qu.deal_result,
         qu.deal_name,
         qu.deal_time,
+        pm.thickness,
         CASE
         WHEN qu.model = pm.id THEN pm.model
         ELSE qu.model
@@ -25,7 +26,7 @@
         ELSE false
         END AS method
         FROM quality_unqualified qu
-        LEFT JOIN product_model pm ON qu.model = pm.id
+        LEFT JOIN product_model pm ON qu.product_model_id = pm.id
         where
         1=1
         <if test="qualityUnqualified.inspectType != null ">
@@ -43,6 +44,7 @@
         <if test="qualityUnqualified.entryDateEnd != null and qualityUnqualified.entryDateEnd != '' ">
             AND  check_time &lt;= DATE_FORMAT(#{qualityUnqualified.entryDateEnd},'%Y-%m-%d')
         </if>
+        order by check_time desc
     </select>
     <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
         SELECT

--
Gitblit v1.9.3