fix bug

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/FormalSettlementSaveRequest.java

@@ -24,6 +24,7 @@ public class FormalSettlementSaveRequest implements Serializable {
 	private String settlementType;
 	private List<Long> sourcePreSettlementIds;
 	private List<Long> sourceDetailIds;
+	private List<DetailAdjustment> detailAdjustments;
 	private LocalDate exchangeRateDate;
 	private BigDecimal exchangeRate;
 	private String attachmentsJson;
@@ -31,6 +32,14 @@ public class FormalSettlementSaveRequest implements Serializable {
 	private List<SummaryFee> summaryFees;
 	private List<Invoice> invoices;
 
+	@Data
+	public static class DetailAdjustment implements Serializable {
+		@Serial private static final long serialVersionUID = 1L;
+		private Long sourcePreSettlementDetailId;
+		private Long sourceDetailId;
+		private BigDecimal adjustAmount;
+	}
+
 	@Data
 	public static class SummaryFee implements Serializable {
 		@Serial private static final long serialVersionUID = 1L;

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/SettlementAdjustmentSaveRequest.java

@@ -22,6 +22,7 @@ public class SettlementAdjustmentSaveRequest implements Serializable {
 		private Long formalSettlementDetailFeeId;
 		private String feeType;
 		private String feeItem;
+		private BigDecimal originalAmountTax;
 		private BigDecimal adjustmentAmountTax;
 		private BigDecimal adjustmentAmountNoTax;
 		private String remark;

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/WaybillMileageRequest.java

@@ -0,0 +1,56 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement
+ * obtained after purchasing a license from BladeX.
+ * <p>
+ * 1. This software is for development use only under a valid license
+ * from BladeX.
+ * <p>
+ * 2. Redistribution of this software's source code to any third party
+ * without a commercial license is strictly prohibited.
+ * <p>
+ * 3. Licensees may copyright their own code but cannot use segments
+ * from this software for such purposes. Copyright of this software
+ * remains with BladeX.
+ * <p>
+ * Using this software signifies agreement to this License, and the software
+ * must not be used for illegal purposes.
+ * <p>
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is
+ * not liable for any claims arising from secondary or illegal development.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 运单里程维护请求
+ *
+ * @author Chill
+ */
+@Data
+@Schema(description = "运单里程维护请求")
+public class WaybillMileageRequest implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	@Schema(description = "运单ID")
+	private Long id;
+
+	@Schema(description = "里程（公里）")
+	private BigDecimal mileage;
+
+	@Schema(description = "里程维护备注")
+	private String mileageRemark;
+
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/ReceivablePayableCargoFee.java

@@ -54,7 +54,7 @@ public class ReceivablePayableCargoFee extends TenantEntity {
 	@Schema(description = "行号")
 	private String lineNo;
 
-	@Schema(description = "来源：自动生成/手工录入")
+	@Schema(description = "来源：自动生成/手动录入")
 	private String dataSource;
 
 	@Schema(description = "货物名称")
@@ -75,6 +75,9 @@ public class ReceivablePayableCargoFee extends TenantEntity {
 	@Schema(description = "计费类型")
 	private String billingType;
 
+	@Schema(description = "命中计费规则JSON")
+	private String billingRulesJson;
+
 	@Schema(description = "运输量")
 	private BigDecimal transportQuantity;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/Waybill.java

@@ -163,6 +163,9 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "里程")
 	private BigDecimal mileage;
 
+	@Schema(description = "里程维护备注")
+	private String mileageRemark;
+
 	@Schema(description = "预计发货日期")
 	private LocalDate estimatedStartTime;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/WaybillVO.java

@@ -51,6 +51,10 @@ public class WaybillVO extends Waybill {
 	@Schema(description = "是否只读")
 	private Boolean readonly;
 
+	@TableField(exist = false)
+	@Schema(description = "是否允许维护里程")
+	private Boolean mileageMaintainable;
+
 	@TableField(exist = false)
 	@Schema(description = "创建人姓名")
 	private String createUserName;