From ec8d7cbe79f8c012f0d855e19fee9dc8cd27608f Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:54 +0800
Subject: [PATCH] 1.各生产订单的完成进度统计接口 2.在制品周转情况接口 3.生产报工记录添加上生产时间字段

---
 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index 3fed962..b513ac1 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -14,25 +14,52 @@
         pl.id,
         pl.purchase_contract_number ,
         pl.sales_contract_no,
+        pl.supplier_id,
         pl.supplier_name,
         pl.project_name,
         pl.contract_amount,
         sum(pr.tickets_amount)as receipt_payment_amount,
         pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
         pl.entry_date,
+        pl.recorder_id,
         pl.recorder_name,
+        pl.template_name,
+        pl.approver_id,
+        sm.is_white,
+        pl.approval_status,
         pl.payment_method
         from purchase_ledger pl
         left join product_record pr on pl.id = pr.purchase_ledger_id
+        left join supplier_manage sm on pl.supplier_id = sm.id
         <where>
+            1 = 1
             <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
-                pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+               and pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
+            </if>
+            <if test="c.approvalStatus != null and c.approvalStatus != ''">
+                and pl.approval_status = #{c.approvalStatus}
+            </if>
+            <if test="c.supplierName != null and c.supplierName != ''">
+                and pl.supplier_name like concat('%',#{c.supplierName},'%')
+            </if>
+            <if test="c.salesContractNo != null and c.salesContractNo != ''">
+                and pl.sales_contract_no like concat('%',#{c.salesContractNo},'%')
+            </if>
+            <if test="c.projectName != null and c.projectName != ''">
+                and pl.project_name like concat('%',#{c.projectName},'%')
+            </if>
+            <if test="c.entryDateStart != null and c.entryDateStart != '' ">
+                AND pl.entry_date &gt;= DATE_FORMAT(#{c.entryDateStart},'%Y-%m-%d')
+            </if>
+            <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
+                AND  pl.entry_date &lt;= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
             </if>
         </where>
         group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
         pl.project_name,pl.entry_date,
         pl.recorder_name,
         pl.contract_amount
+        order by pl.entry_date desc
 
     </select>
     <select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">

--
Gitblit v1.9.3