From e0cc9278a0bcbf480446f87a78b9d7ddd8819eeb Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
index 7510e95..4864194 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -540,9 +540,12 @@
</update>
<update id="updatePendingSettlementBusinessIsCreate">
-
UPDATE pending_settlement_business
- SET is_create = 1 ,bill_id = #{id},bill_name = #{billName},related_bill_status = 1
+ SET
+ is_create = 1,
+ bill_id = #{id},
+ bill_name = #{billName},
+ related_bill_status = 1
WHERE dispatch_no IN
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
@@ -554,18 +557,16 @@
SET
p.bill_name = #{billName},
e.related_bill_name = #{billName}
- WHERE p.bill_id = #{id};
+ WHERE p.bill_id = #{id}
</update>
<update id="updateEstimatedReceivableBillStatus">
- UPDATE pending_settlement_business p
- JOIN estimated_receivable e ON p.dispatch_no = e.dispatch_no
+ UPDATE pending_settlement_business
SET
- p.is_create = 1,
- p.bill_id = #{id},
- p.bill_name = #{billName},
- p.related_bill_status = 1,
- e.related_bill_name = #{billName}
- WHERE p.dispatch_no IN
+ is_create = 1,
+ bill_id = #{id},
+ bill_name = #{billName},
+ related_bill_status = 1,
+ WHERE dispatch_no IN
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
</foreach>
--
Gitblit v1.8.0