用车需求计算添加供应商编码

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())

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 = "送货区域")