From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对(未明确) 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检,抽检的话是抽多少百分比 6.供应商管理东西太少了,没有资质文件啊这些东西(是不是可以参考pro) 7.采购审批把人从李莹莹改成龙红星

---
 src/main/resources/mapper/sales/SalesLedgerMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 712fd9b..1cd3971 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -62,7 +62,8 @@
         T1.payment_method,
         T1.delivery_date,
         DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
-        IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh
+        IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh,
+        T3.purchase_contract_number
         FROM sales_ledger T1
         LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
         LEFT JOIN (
@@ -74,6 +75,7 @@
         FROM shipping_info
         GROUP BY sales_ledger_id
         ) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
+        LEFT JOIN purchase_ledger T3 ON T1.purchase_ledger_id = T3.id
 
         <where>
             <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
@@ -137,7 +139,7 @@
                 and c.customer_name like concat('%',#{customerName},'%')
             </if>
         </where>
-        order by sl.create_time desc
+        order by sl.entry_date desc
     </select>
 
 </mapper>

--
Gitblit v1.9.3