From f71dabccb0e4c2fa410683e6058eb906a7dbf094 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 26 八月 2026 18:12:07 +0800
Subject: [PATCH] feat 采购修正
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
index 47491ee..5cd0071 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java
@@ -69,6 +69,10 @@
@DiffLogField(name = "鍚堝悓閲戦")
private BigDecimal totalPrice;
+ @Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", example = "1000.00")
+ @DiffLogField(name = "瀹氶噾閲戦")
+ private BigDecimal depositPrice;
+
@Schema(description = "瀹㈡埛绛剧害浜虹紪鍙�", example = "18546")
@DiffLogField(name = "瀹㈡埛绛剧害浜�", function = CrmContactParseFunction.NAME)
private Long signContactId;
@@ -81,6 +85,28 @@
@DiffLogField(name = "澶囨敞")
private String remark;
+ @Schema(description = "鍚堝悓绫诲瀷锛坧ower/energy/resident/solar锛�", example = "power")
+ @DiffLogField(name = "鍚堝悓绫诲瀷")
+ private String contractType;
+
+ @Schema(description = "鐢靛帇绛夌骇", example = "10kV")
+ private String voltageLevel;
+
+ @Schema(description = "鐢ㄧ數绫诲瀷", example = "industrial")
+ private String electricityType;
+
+ @Schema(description = "鍚堝悓瀹归噺锛坘VA锛�", example = "800")
+ private BigDecimal contractCapacity;
+
+ @Schema(description = "鐢典环妯″紡", example = "two-part")
+ private String tariffMode;
+
+ @Schema(description = "璁￠噺鏂瑰紡", example = "high-high")
+ private String meterMode;
+
+ @Schema(description = "缂磋垂鍛ㄦ湡锛堟湀锛�", example = "12")
+ private Integer payCycle;
+
@Schema(description = "浜у搧鍒楄〃")
private List<Product> products;
@@ -90,13 +116,13 @@
@AllArgsConstructor
public static class Product {
- @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- @NotNull(message = "浜у搧缂栧彿涓嶈兘涓虹┖")
- private Long productId;
+ @Schema(description = "MDM 鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
+ @NotNull(message = "鐗╂枡缂栧彿涓嶈兘涓虹┖")
+ private Long itemId;
- @Schema(description = "浜у搧鍗曚环", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- @NotNull(message = "浜у搧鍗曚环涓嶈兘涓虹┖")
- private BigDecimal productPrice;
+ @Schema(description = "鐗╂枡鍘熶环", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
+ @NotNull(message = "鐗╂枡鍘熶环涓嶈兘涓虹┖")
+ private BigDecimal itemPrice;
@Schema(description = "鍚堝悓浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
@NotNull(message = "鍚堝悓浠锋牸涓嶈兘涓虹┖")
--
Gitblit v1.9.3