From e02812df9217d3e50a368a8234c07c60c64c0ff4 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 05 八月 2026 08:34:26 +0800
Subject: [PATCH] feat:新增石煤机 机械厂模版合同/客户数据主数据同步接口/合同履约进度新增质保结束操作/合同开票状态 修改为待开 可开 已开/出库逻辑完善
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
index 2710888..28bae44 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
@@ -15,6 +15,11 @@
@Data
public class ContractAddDTO {
+ private String dataId;
+
+ @Schema(description = "鍚堝悓缂栧彿")
+ private String contractNo;
+
@Schema(description = "鍚堝悓鍚嶇О")
private String contractName;
@@ -63,6 +68,11 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
+ @Schema(description = "鐢熸晥鏃ユ湡")
+ private String effectiveDate;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鍒版湡鏃ユ湡")
private String expirationDate;
@@ -81,8 +91,8 @@
@Schema(description = "鎵ц鍛ㄦ湡 1/鍛� 2/鏈� 3/瀛ｅ害 4/鍗婂勾 5/骞�")
private String execFrequency;
- @Schema(description = "鎵ц娆℃暟")
- private Integer execTimes;
+// @Schema(description = "鎵ц娆℃暟")
+// private Integer execTimes;
@Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹")
private Integer execDay;
@@ -141,6 +151,99 @@
@Schema(description = "寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐�")
private BigDecimal invoiceNotice;
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ private BigDecimal contractTax;
+
+ @Schema(description = "缁忔祹浜嬮」 bip鎺ㄩ�佸簲鏀剁敤")
+ private String economicMatters;
+
+ @Schema(description = "瀹㈡埛erp缂栫爜")
+ private String partyACode;
+
+ @Column(columnDefinition = "VARCHAR(50) comment '琛屼笟'")
+ private String industryCode;
+
+ @Column(columnDefinition = "VARCHAR(50) comment '鍖哄煙'")
+ private String areaCode;
+
+ @Schema(description = "闇�鏂瑰湪鎺ュ埌閫氱煡鍚� 鏃ュ唴杩涜妫�楠�")
+ private BigDecimal inspectDay;
+
+ @Schema(description = "鏀跺埌渚涙柟閫氱煡鍚� 鏃ュ唴娲句汉楠屾敹")
+ private BigDecimal acceptDay;
+
+ @Schema(description = "寤堕獙鏀惰秴杩� 鏃�")
+ private BigDecimal delayAcceptDay;
+
+ @Schema(description = "楠屾敹鍚堟牸鍚� 涓伐浣滄棩")
+ private BigDecimal acceptPassDay;
+
+ @Schema(description = "楠屾敹鍚堟牸鍚戜緵鏂硅冻棰濇敮浠樺悎鍚屾�讳环鐨�")
+ private BigDecimal acceptPassAmount;
+
+ @Schema(description = "鏃ュ唴寮�濮嬪彂璐�")
+ private BigDecimal deliverDay;
+
+ @Schema(description = "鏃ュ唴鍙戝畬")
+ private BigDecimal deliverCompleteDay;
+
+ @Schema(description = "渚涙柟浠ｇ悊")
+ private String supplierAgent;
+
+ @Schema(description = "渚涙柟浠ｇ悊韬唤璇�")
+ private String supplierAgentIdCard;
+
+ @Schema(description = "闇�鏂逛唬鐞�")
+ private String buyerAgent;
+
+ @Schema(description = "闇�鏂逛唬鐞嗚韩浠借瘉")
+ private String buyerAgentIdCard;
+
+ private String agentAuthority;
+
+ @Schema(description = "寤舵湡鏀粯棰勪粯娆�")
+ private BigDecimal delayPayAdvancePayment;
+
+ @Schema(description = "寤舵湡鏀粯杩涘害娆�")
+ private BigDecimal delayPayProcessPayment;
+
+ @Schema(description = "鏀跺埌棰勪粯娆句箣鏃ヨ捣 涓湀鍐呮湭鐢熶骇瀹屾垚")
+ private BigDecimal receiveAdvancePaymentMonth;
+
+ @Schema(description = "骞舵彁鍓� 鍚勫伐浣滄棩閫氱煡闇�鏂归獙鏀�")
+ private BigDecimal noticeSupplierAcceptDay;
+
+ @Schema(description = "姣忛�炬湡 鏃�")
+ private BigDecimal overdueDay;
+
+ @Schema(description = "鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�")
+ private BigDecimal lossAmount;
+
+ @Schema(description = "杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�")
+ private BigDecimal liquidatedDamagesHighSupplier;
+
+ @Schema(description = "闇�鏂瑰閫炬湡浠樻姣忛�炬湡 鏃�")
+ private BigDecimal overdueDayXf;
+
+ @Schema(description = "闇�鏂瑰閫炬湡浠樻鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�")
+ private BigDecimal lossAmountXf;
+
+ @Schema(description = "杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�")
+ private BigDecimal liquidatedDamagesHighBuyer;
+
+ @Schema(description = "鏈悎鍚屼竴寮� 浠�")
+ private BigDecimal totalParts;
+
+ @Schema(description = "渚涙柟鎵� 浠�")
+ private BigDecimal supplierPart;
+
+ @Schema(description = "闇�鏂规墽 浠�")
+ private BigDecimal buyerPart;
+
+ private BigDecimal advancePayment;
+
+ @Schema(description = "浠樻鏂瑰紡")
+ private String paymentMethod;
private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule;
--
Gitblit v1.9.1