From bf4b42e868ea0a59ca576d70d60f0b20d9c4742d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 01 七月 2026 10:46:36 +0800
Subject: [PATCH] 采购入库没有带出对应的采购合同号（不用区分原材料、半成品、成品）
---
src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
index a818160..60d6f4a 100644
--- a/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
+++ b/src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml
@@ -6,7 +6,8 @@
<update id="updateContractAmountById">
UPDATE purchase_ledger
- SET contract_amount = #{totalTaxInclusiveAmount}
+ SET contract_amount = #{totalTaxInclusiveAmount},
+ net_contract_amount = #{totalTaxInclusiveAmount}
WHERE id = #{id}
</update>
<select id="selectPurchaseStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
@@ -27,6 +28,7 @@
pl.supplier_name,
pl.project_name,
pl.contract_amount,
+ pl.net_contract_amount,
pl.entry_date,
pl.execution_date,
pl.recorder_id,
@@ -120,6 +122,12 @@
<if test="c.supplierId != null">
AND pl.supplier_id = #{c.supplierId}
</if>
+ <if test="c.ids != null and c.ids.size() > 0">
+ AND pl.id IN
+ <foreach collection="c.ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
<if test="c.approvalStatus != null">
AND pl.approval_status = #{c.approvalStatus}
</if>
--
Gitblit v1.9.3