From 1395356d3b3423f8cb90ded6b5fe8eb2eb52af23 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 18 八月 2025 10:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
index 7510e95..629b5bc 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -540,10 +540,16 @@
</update>
<update id="updatePendingSettlementBusinessIsCreate">
-
- UPDATE pending_settlement_business
- SET is_create = 1 ,bill_id = #{id},bill_name = #{billName},related_bill_status = 1
- WHERE dispatch_no IN
+ UPDATE pending_settlement_business p
+ JOIN estimated_receivable e ON p.dispatch_no = e.dispatch_no
+ SET
+ p.is_create = 1,
+ p.bill_id = #{id},
+ p.bill_name = #{billName},
+ p.related_bill_status = 1,
+ e.related_bill_name = #{billName},
+ e.related_bill_status = 1
+ WHERE p.dispatch_no IN
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
</foreach>
@@ -554,7 +560,7 @@
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
@@ -565,6 +571,7 @@
p.bill_name = #{billName},
p.related_bill_status = 1,
e.related_bill_name = #{billName}
+ e.related_bill_status = 1
WHERE p.dispatch_no IN
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
--
Gitblit v1.8.0