✨ 结算单支持业务模式与运输方式,并修复组织合同流水号空值
预结算/正式结算主表新增业务模式、运输方式及列表导出字典翻译;组织合同初始流水号未填时不落-1,OA同步保留本地合同配置。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+4
@@ -26,6 +26,10 @@ public class FormalSettlementSaveRequest implements Serializable {
|
||||
private List<Long> sourcePreSettlementIds;
|
||||
private List<Long> sourceDetailIds;
|
||||
private List<DetailAdjustment> detailAdjustments;
|
||||
/** 业务模式(业务字典 business_model) */
|
||||
private String businessModel;
|
||||
/** 运输方式(业务字典 transport_type) */
|
||||
private String transportType;
|
||||
private LocalDate exchangeRateDate;
|
||||
private BigDecimal exchangeRate;
|
||||
private String attachmentsJson;
|
||||
|
||||
+6
@@ -55,6 +55,12 @@ public class PreSettlementSaveRequest implements Serializable {
|
||||
@Schema(description = "结算类型:receivable/payable")
|
||||
private String settlementType;
|
||||
|
||||
@Schema(description = "业务模式(业务字典 business_model)")
|
||||
private String businessModel;
|
||||
|
||||
@Schema(description = "运输方式(业务字典 transport_type)")
|
||||
private String transportType;
|
||||
|
||||
@Schema(description = "汇率日期")
|
||||
private LocalDate exchangeRateDate;
|
||||
|
||||
|
||||
+8
@@ -88,6 +88,14 @@ public class FormalSettlement extends TenantEntity {
|
||||
* 结算金额(结算币种,含全部合计费用)
|
||||
*/
|
||||
private BigDecimal settlementAmount;
|
||||
/**
|
||||
* 业务模式(业务字典 business_model)
|
||||
*/
|
||||
private String businessModel;
|
||||
/**
|
||||
* 运输方式(业务字典 transport_type)
|
||||
*/
|
||||
private String transportType;
|
||||
/**
|
||||
* 本位币,默认 RMB
|
||||
*/
|
||||
|
||||
+6
@@ -92,6 +92,12 @@ public class PreSettlement extends TenantEntity {
|
||||
@Schema(description = "结算金额")
|
||||
private BigDecimal settlementAmount;
|
||||
|
||||
@Schema(description = "业务模式(业务字典 business_model)")
|
||||
private String businessModel;
|
||||
|
||||
@Schema(description = "运输方式(业务字典 transport_type)")
|
||||
private String transportType;
|
||||
|
||||
@Schema(description = "本位币")
|
||||
private String localCurrency;
|
||||
|
||||
|
||||
+2
@@ -43,6 +43,8 @@ public class FormalSettlementVO extends FormalSettlement implements KingdeeUnloc
|
||||
@TableField(exist = false) private String ids;
|
||||
@TableField(exist = false) private String approvalStatusName;
|
||||
@TableField(exist = false) private String settlementTypeName;
|
||||
@TableField(exist = false) @Schema(description = "业务模式名称") private String businessModelName;
|
||||
@TableField(exist = false) @Schema(description = "运输方式名称") private String transportTypeName;
|
||||
@TableField(exist = false) private Integer attachmentCount;
|
||||
@TableField(exist = false) private String attachmentSyncStatus;
|
||||
@TableField(exist = false) private String attachmentSyncStatusName;
|
||||
|
||||
+8
@@ -85,6 +85,14 @@ public class PreSettlementVO extends PreSettlement {
|
||||
@Schema(description = "结算类型名称")
|
||||
private String settlementTypeName;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "业务模式名称")
|
||||
private String businessModelName;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "运输方式名称")
|
||||
private String transportTypeName;
|
||||
|
||||
@TableField(exist = false)
|
||||
@Schema(description = "结算明细")
|
||||
private List<PreSettlementDetail> details;
|
||||
|
||||
Reference in New Issue
Block a user