From e6a9f5e801495e965eb1dbe40fcf9dd5df4eb6a5 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 29 九月 2025 08:53:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
index 629b5bc..ad20c35 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -532,7 +532,7 @@
</foreach>
</update>
<update id="updeteCwData">
- update pending_settlement_business set IS_SYNC = 1
+ update tms_shipment set IS_SYNC = 1
where ID in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
@@ -540,16 +540,13 @@
</update>
<update id="updatePendingSettlementBusinessIsCreate">
- 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},
- e.related_bill_status = 1
- 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>
@@ -563,16 +560,9 @@
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
- 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
+ UPDATE pending_settlement_business
+ SET related_bill_status = #{status}
+ WHERE dispatch_no IN
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item}
</foreach>
--
Gitblit v1.8.0