From 96119ca3973d5ea643db6a87b6a23fe404ddb8cc Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期一, 29 六月 2026 15:35:40 +0800 Subject: [PATCH] feat:合同编号规则调整 出库编号规则调整 --- platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 87 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 84 insertions(+), 3 deletions(-) diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java index 72682e9..cdb8461 100644 --- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java +++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java @@ -1,14 +1,14 @@ package com.by4cloud.platformx.business.vo; -import com.by4cloud.platformx.business.dto.ContractPaymentScheduleAddDTO; -import com.by4cloud.platformx.business.dto.ContractSubjectMatterAddDTO; import com.by4cloud.platformx.business.entity.ContractPaymentSchedule; import com.by4cloud.platformx.business.entity.ContractSubjectMatter; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.util.List; @Data @@ -19,11 +19,17 @@ @Schema(description = "鍚堝悓鍚嶇О") private String contractName; + @Schema(description = "鍚堝悓鍚嶇О") + private String contractNo; + @Schema(description = "鐢叉柟id") private Long partyAId; @Schema(description = "鐢叉柟鍚嶇О") private String partyA; + + @Schema(description = "鐢叉柟绋庡彿") + private String partyAOrgCode; @Schema(description = "涔欐柟id") private Long partyBId; @@ -41,7 +47,7 @@ private Integer contractType; @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬") - private Integer supplyAttribute; + private String supplyAttribute; @Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級") private Integer contractStatus; @@ -76,6 +82,81 @@ @Schema(description = "妯＄増ID") private Long templateId; + @Schema(description = "鍚堝悓鍒嗙被") + private String contractCategory; + + @Schema(description = "绛捐鍦扮偣") + private String signPlace; + + @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; + private List<ContractPaymentSchedule> contractPaymentSchedule; private List<ContractSubjectMatter> contractSubjectMatter; -- Gitblit v1.9.1