✨ 合同结算币种贯通应收应付与结算，并完善合同编号与字段

合同结算币种写入应收应付与预结算；总单运费默认币种统一为 RMB；同步合同申请日期、主要内容、部门合同编号前缀及用印材料字典等能力。

Co-authored-by: Cursor <cursoragent@cursor.com>

blade-service-api/blade-system-api/src/main/java/org/springblade/system/pojo/entity/Dept.java

@@ -144,6 +144,12 @@ public class Dept extends TenantEntity {
 	@Schema(description = "金蝶部门代码")
 	private String kingdeeDeptCode;
 
+	/**
+	 * 合同编码前缀（合同编号：前缀（年份）三位流水号）
+	 */
+	@Schema(description = "合同编码前缀")
+	private String contractCodePrefix;
+
 	/**
 	 * 组织简称
 	 */

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

@@ -61,10 +61,10 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "所属项目")
 	private String projectName;
 
-	@Schema(description = "所属组织ID")
+	@Schema(description = "合同负责部门ID")
 	private Long organizationId;
 
-	@Schema(description = "所属组织")
+	@Schema(description = "合同负责部门")
 	private String organizationName;
 
 	@Schema(description = "合同类别")
@@ -100,6 +100,9 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "签订日期")
 	private LocalDate signDate;
 
+	@Schema(description = "申请日期（提交正式合同时写入）")
+	private LocalDate applyDate;
+
 	@Schema(description = "结算方式")
 	private String settlementMode;
 
@@ -107,6 +110,7 @@ public class ContractManage extends TenantEntity {
 	private String contractFormat;
 
 	@Schema(description = "是否需要加盖法人章")
+	@TableField(insertStrategy = FieldStrategy.ALWAYS, updateStrategy = FieldStrategy.ALWAYS)
 	private Integer legalSealFlag;
 
 	@Schema(description = "一式份数")
@@ -206,7 +210,10 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "终止原因")
 	private String terminateReason;
 
-	@Schema(description = "备注")
+	@Schema(description = "合同主要内容")
+	private String mainContent;
+
+	@Schema(description = "其他事项说明")
 	private String remark;
 
 }

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

@@ -25,6 +25,8 @@ package org.springblade.transport.pojo.entity;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -82,6 +84,7 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "型号")
 	private String model;
 
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "数量")
 	private BigDecimal quantity;
 
@@ -183,6 +186,7 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "押运人手机号")
 	private String escortPhone;
 
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "里程")
 	private BigDecimal mileage;
 
@@ -195,12 +199,14 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "预计完成日期")
 	private LocalDate estimatedEndTime;
 
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "单价")
 	private BigDecimal unitPrice;
 
 	@Schema(description = "计价单位")
 	private String priceUnit;
 
+	@JsonSerialize(nullsUsing = NullSerializer.class)
 	@Schema(description = "其他费用合计")
 	private BigDecimal otherFeeTotal;