From 5a347be900bf045c947cdbc08167526cd44116db Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 18:18:50 +0800
Subject: [PATCH] fix(erp/crm): 单据明细单价口径由「不含税单价」改为「含税单价」
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractSaveReqVO.java | 19 +++++++++++++------
1 files changed, 13 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..1b0474e 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
@@ -25,6 +25,9 @@
@Schema(description = "鍚堝悓缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "10430")
private Long id;
+ @Schema(description = "鍚堝悓缂栧彿锛堜笟鍔″崟鍙凤級", example = "HT20260101001")
+ private String no;
+
@Schema(description = "鍚堝悓鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐜嬩簲")
@DiffLogField(name = "鍚堝悓鍚嶇О")
@NotNull(message = "鍚堝悓鍚嶇О涓嶈兘涓虹┖")
@@ -69,6 +72,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;
@@ -90,13 +97,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