From 6e312c64c056acf479a6dd8393dd42a80b69b7d4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 七月 2026 10:25:07 +0800
Subject: [PATCH] 1.新增销售报价 2.crm整合mdm
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
index 307a747..23b17b2 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractRespVO.java
@@ -92,6 +92,12 @@
@ExcelProperty("宸插洖娆鹃噾棰�")
private BigDecimal totalReceivablePrice;
+ @Schema(description = "鍏宠仈 ERP 閿�鍞鍗曠紪鍙�", example = "12345")
+ private Long orderId;
+ @Schema(description = "ERP 閿�鍞鍗曞崟鍙�", example = "SO001")
+ @ExcelProperty("閿�鍞鍗曞崟鍙�")
+ private String orderNo;
+
@Schema(description = "瀹㈡埛绛剧害浜虹紪鍙�", example = "18546")
private Long signContactId;
@Schema(description = "瀹㈡埛绛剧害浜�", example = "灏忚眴")
@@ -136,17 +142,21 @@
@Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "888")
private Long id;
- @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private Long productId;
- @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鏉庡洓")
- private String productName;
- @Schema(description = "浜у搧鏉＄爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
- private String productNo;
- @Schema(description = "浜у搧鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "鏉庡洓")
- private Integer productUnit;
+ @Schema(description = "MDM 鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "20529")
+ private Long itemId;
+ @Schema(description = "鐗╂枡缂栫爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "ITEM001")
+ private String itemCode;
+ @Schema(description = "鐗╂枡鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐗╂枡A")
+ private String itemName;
+ @Schema(description = "鐗╂枡鏉＄爜", example = "BAR001")
+ private String itemBarCode;
+ @Schema(description = "璁￠噺鍗曚綅缂栧彿", example = "1")
+ private Long itemUnitId;
+ @Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
+ private String itemUnitName;
- @Schema(description = "浜у搧鍗曚环", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
- private BigDecimal productPrice;
+ @Schema(description = "鐗╂枡鍘熶环", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ private BigDecimal itemPrice;
@Schema(description = "鍚堝悓浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED, example = "123.00")
private BigDecimal contractPrice;
--
Gitblit v1.9.3