From 8f09b654890ede6bc141bdae96c8feaca6144879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com>
Date: Thu, 24 Apr 2025 15:01:01 +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=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VehicleDemandServiceImpl.java             | 7 ++++++-
 .../vehicledemandcount/entity/VehicleDemandCount.java      | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java
index 4fa7f0c..f81950c 100644
--- a/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java
+++ b/jeecg-boot/jeecg-module-tms/src/main/java/org/jeecg/modules/tms/outbound/vehicledemand/service/impl/VehicleDemandServiceImpl.java
@@ -101,7 +101,10 @@ public class VehicleDemandServiceImpl extends ServiceImpl<VehicleDemandMapper, V
 
                     // 更新车辆选择
                     Map<String, Integer> newChoices = new HashMap<>(choices.get(i));
-                    newChoices.put(iogisticsPrice.getCarType() + "," +iogisticsPrice.getCarLong(), newChoices.getOrDefault(iogisticsPrice.getCarType() + "," +iogisticsPrice.getCarLong(), 0) + 1);
+                    newChoices.put(iogisticsPrice.getCarType() + "," + iogisticsPrice.getCarLong()
+                                    + "," + iogisticsPrice.getSupplierCode(),
+                            newChoices.getOrDefault(iogisticsPrice.getCarType() + "," +iogisticsPrice.getCarLong()
+                                    + "," + iogisticsPrice.getSupplierCode(), 0) + 1);
                     choices.put(next, newChoices);
                 }
             }
@@ -134,12 +137,14 @@ public class VehicleDemandServiceImpl extends ServiceImpl<VehicleDemandMapper, V
             }*/
             String carType = parts[0]; // 车类型
             double carLong = Double.parseDouble(parts[1]); // 车长度
+            String supplierCode = parts[2]; // 供应商编码
 
             // 根据车辆数量生成多条记录
             for (int i = 0; i < count; i++) {
                 VehicleDemandCount vehicleDemandCount = new VehicleDemandCount();
                 vehicleDemandCount.setCarType(carType)
                         .setCarLong(carLong)
+                        .setSupplierCode(supplierCode)
                         .setVdNo(vehicleDemand.getVdNo())
                         .setShipType(vehicleDemand.getShipType())
                         .setDeliveryAddress(vehicleDemand.getDeliveryAddress())
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 a9e107d..bcc3050 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
@@ -70,6 +70,10 @@ public class VehicleDemandCount implements Serializable {
 	@Excel(name = "车长", width = 15)
     @ApiModelProperty(value = "车长")
     private java.lang.Double carLong;
+    /**供应商编码*/
+    @Excel(name = "供应商编码", width = 15)
+    @ApiModelProperty(value = "供应商编码")
+    private java.lang.String supplierCode;
 	/**送货区域*/
 	@Excel(name = "送货区域", width = 15)
     @ApiModelProperty(value = "送货区域")