调整结算管理

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

@@ -44,9 +44,33 @@ public class ReceivablePayableAdjustFeeRequest implements Serializable {
 		@Schema(description = "费用行ID")
 		private Long id;
 
+		@Schema(description = "货物名称")
+		private String cargoName;
+
+		@Schema(description = "货物类型")
+		private String cargoType;
+
+		@Schema(description = "规格")
+		private String specification;
+
+		@Schema(description = "型号")
+		private String model;
+
+		@Schema(description = "计费要素")
+		private String billingFactor;
+
+		@Schema(description = "计费类型")
+		private String billingType;
+
 		@Schema(description = "运输量")
 		private BigDecimal transportQuantity;
 
+		@Schema(description = "运费计算单位")
+		private String priceUnit;
+
+		@Schema(description = "运输单价")
+		private BigDecimal unitPrice;
+
 		@Schema(description = "里程")
 		private BigDecimal mileage;
 
@@ -59,15 +83,6 @@ public class ReceivablePayableAdjustFeeRequest implements Serializable {
 		@Schema(description = "是否手工费用行")
 		private Boolean manualFee;
 
-		@Schema(description = "手工费用项目名称")
-		private String feeItemName;
-
-		@Schema(description = "手工费用类型：charge/deduct")
-		private String feeType;
-
-		@Schema(description = "手工费用金额")
-		private BigDecimal amount;
-
 		@Schema(description = "备注")
 		private String remark;
 

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

@@ -11,6 +11,7 @@ public class SettlementAdjustmentSaveRequest implements Serializable {
 	@Serial private static final long serialVersionUID = 1L;
 	private Long id;
 	private Long formalSettlementId;
+	private String attachmentsJson;
 	private String remark;
 	private List<Detail> details;
 

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

@@ -48,6 +48,8 @@ public class FormalSettlement extends TenantEntity {
 	private BigDecimal localSettlementAmount;
 	private BigDecimal appliedPaymentAmount;
 	private BigDecimal paidAmount;
+	private BigDecimal remainingPayableAmount;
+	private BigDecimal invoiceAmount;
 	private LocalDate exchangeRateDate;
 	private BigDecimal exchangeRate;
 	private String invoiceStatus;

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

@@ -54,6 +54,9 @@ public class ReceivablePayableCargoFee extends TenantEntity {
 	@Schema(description = "行号")
 	private String lineNo;
 
+	@Schema(description = "来源：自动生成/手工录入")
+	private String dataSource;
+
 	@Schema(description = "货物名称")
 	private String cargoName;
 
@@ -66,10 +69,10 @@ public class ReceivablePayableCargoFee extends TenantEntity {
 	@Schema(description = "型号")
 	private String model;
 
-	@Schema(description = "运费计费要素")
+	@Schema(description = "计费要素")
 	private String billingFactor;
 
-	@Schema(description = "运费计费类型")
+	@Schema(description = "计费类型")
 	private String billingType;
 
 	@Schema(description = "运输量")

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

@@ -30,6 +30,7 @@ public class SettlementAdjustment extends TenantEntity {
 	private String currentNode;
 	private String currentProcessor;
 	private String kingdeeSyncStatus;
+	private String attachmentsJson;
 	private String remark;
 	private LocalDateTime approvedTime;
 }

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

@@ -47,6 +47,10 @@ public class ReceivablePayableDetailVO extends ReceivablePayableDetail {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	@TableField(exist = false)
+	@Schema(description = "指定明细ID，多个使用逗号分隔")
+	private String ids;
+
 	@TableField(exist = false)
 	@Schema(description = "生成开始日期")
 	@DateTimeFormat(pattern = "yyyy-MM-dd")