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 | 192 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 183 insertions(+), 9 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 7a1110b..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
@@ -1,7 +1,6 @@
package com.by4cloud.platformx.business.dto;
-import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
-import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,10 +9,16 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
@Data
public class ContractAddDTO {
+
+ private String dataId;
+
+ @Schema(description = "鍚堝悓缂栧彿")
+ private String contractNo;
@Schema(description = "鍚堝悓鍚嶇О")
private String contractName;
@@ -50,18 +55,24 @@
@Schema(description = "鍚堝悓鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
private Integer contractAttribute;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "绛剧讲鏃ユ湡")
- private String signDate;
+ private Date signDate;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "澶囨敞")
+ private String signPlace;
+
+ @Schema(description = "浜や粯鍛ㄦ湡")
+ private Integer deliveryCycle;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鐢熸晥鏃ユ湡")
private String effectiveDate;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鍒版湡鏃ユ湡")
private String expirationDate;
@@ -71,6 +82,169 @@
@Schema(description = "澶囨敞")
private String remark;
+ @Schema(description = "妯＄増ID")
+ private Long templateId;
+
+ @Schema(description = "鍚堝悓鍒嗙被")
+ private String contractCategory;
+
+ @Schema(description = "鎵ц鍛ㄦ湡 1/鍛� 2/鏈� 3/瀛ｅ害 4/鍗婂勾 5/骞�")
+ private String execFrequency;
+
+// @Schema(description = "鎵ц娆℃暟")
+// private Integer execTimes;
+
+ @Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹")
+ private Integer execDay;
+
+ @Schema(description = "鐜")
+ private String environment;
+
+ @Schema(description = "鏍囧噯")
+ private String standard;
+
+ @Schema(description = "璐ㄤ繚鏈� 浣跨敤鏈堟暟")
+ private BigDecimal useMonth;
+
+ @Schema(description = "璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁�")
+ private BigDecimal afterShipMonth;
+
+ @Schema(description = "璐ц繍鏂瑰紡")
+ private String shipMethod;
+
+ @Schema(description = "璐ц繍鍦板潃")
+ private String shipAddress;
+
+ @Schema(description = "鍖呰")
+ private String packaging;
+
+ @Schema(description = "缁翠慨鎴栨崲璐ф湡闄�")
+ private BigDecimal repairPeriod;
+
+ @Schema(description = "缁翠慨鎴栨崲璐� 杩濈害閲�")
+ private BigDecimal repairBreachAmount;
+
+ @Schema(description = "璐х墿鏁伴噺涓嶈冻 琛ヨ揣澶╂暟")
+ private BigDecimal goodsShort;
+
+ @Schema(description = "璐х墿鏁伴噺涓嶈冻 杩濈害閲�")
+ private BigDecimal goodsShortBreachAmount;
+
+ @Schema(description = "姣忛�炬湡涓�鏃ワ紝鎵挎媴鏈悎鍚屾�婚 杩濈害閲�")
+ private BigDecimal overdueBreachAmount;
+
+ @Schema(description = "閫炬湡 鏃ヤ互涓婄殑锛岀敳鏂规湁鏉冭В闄ゅ悎鍚�")
+ private BigDecimal terminateContract;
+
+ @Schema(description = "鍙屾柟鍧囧彲鍚� 浜烘皯娉曢櫌")
+ private String court;
+
+ @Schema(description = "鏈悎鍚岄檮浠跺寘鎷細")
+ private String contractAttchment;
+
+ @Schema(description = "鍚堝悓绛捐甯�")
+ private String city;
+
+ @Schema(description = "鍚堝悓绛捐鍖�")
+ private String region;
+
+ @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;
private List<ContractSubjectMatterAddDTO> contractSubjectMatter;
--
Gitblit v1.9.1