From c11e6f07b031eea6c7de4c5508b8dbf0ee01d2c7 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 01 四月 2026 10:08:08 +0800
Subject: [PATCH] 去除不同报价方案,不能添加相同【客户-路线-车型】数据

---
 tms/src/main/java/com/ruoyi/tms/service/impl/TmsArBillServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsArBillServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsArBillServiceImpl.java
index f6b8857..637ef81 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsArBillServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsArBillServiceImpl.java
@@ -376,15 +376,15 @@
                         
                         // 瑁呰揣鐐�
                         Cell cell2 = row.createCell(2);
-                        if (dispatchOrder != null && dispatchOrder.getShipperAddress() != null) {
-                            cell2.setCellValue(dispatchOrder.getShipperAddress());
+                        if (dispatchOrder != null && dispatchOrder.getShipperRegionLabel() != null) {
+                            cell2.setCellValue(dispatchOrder.getShipperRegionLabel());
                             cell2.setCellStyle(styles.get("data"));
                         }
 
                         // 鍗歌揣鐐�
                         Cell cell3 = row.createCell(3);
-                        if (dispatchOrder != null && dispatchOrder.getReceiverAddress() != null) {
-                            cell3.setCellValue(dispatchOrder.getReceiverAddress());
+                        if (dispatchOrder != null && dispatchOrder.getReceiverRegionLabel() != null) {
+                            cell3.setCellValue(dispatchOrder.getReceiverRegionLabel());
                             cell3.setCellStyle(styles.get("data"));
                         }
 

--
Gitblit v1.8.0