From 5315175871cc151458edbe398337762d85de1619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Fri, 25 Apr 2025 14:40:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E8=BD=A6=E9=9C=80=E6=B1=82=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outbound/vehicledemandcount/entity/VehicleDemandCount.java | 3 +++
 .../vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/entity/VehicleDemandCount.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/entity/VehicleDemandCount.java
index ddcabac..2fac654 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/entity/VehicleDemandCount.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/entity/VehicleDemandCount.java
@@ -74,6 +74,9 @@ public class VehicleDemandCount implements Serializable {
     @Excel(name = "供应商编码", width = 15)
     @ApiModelProperty(value = "供应商编码")
     private java.lang.String supplierCode;
+    /**供应商名称*/
+    @TableField(exist = false)
+    private java.lang.String supplierName;
 	/**送货区域*/
 	@Excel(name = "送货区域", width = 15)
     @ApiModelProperty(value = "送货区域")
diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml
index 61b9775..d1ae253 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemandcount/mapper/xml/VehicleDemandCountMapper.xml
@@ -4,12 +4,13 @@
 
     <select id="getByVdNo"
             resultType="org.jeecg.modules.tms.outbound.vehicledemandcount.entity.VehicleDemandCount">
-        select a.*, b.tandard_price from tms_vehicle_demand_count a
+        select a.*, b.tandard_price, b.supplier_name from tms_vehicle_demand_count a
         left join tms_iogistics_price b
         on a.car_type = b.car_type
         and a.car_long = b.car_long
         and a.pick_up_hub = b.start_city
         and a.delivery_address = b.target_city
+        and a.supplier_code = b.supplier_code
         where a.vd_no = #{vdNo}
     </select>
 </mapper>
\ No newline at end of file