From a82d847bbb39e2417d4c9773ebc4fc51fdb0b8fc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 10 十一月 2026 13:31:31 +0800
Subject: [PATCH] feat(crm): 完善投标保证金与报价单关联及作废功能
---
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 deletions(-)
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java
index ad95d47..94365b6 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/quotation/vo/CrmSaleQuotationRespVO.java
@@ -104,6 +104,35 @@
@ExcelProperty("鍏宠仈鍚堝悓鍗曞彿")
private String contractNo;
+ @Schema(description = "鏄惁闇�瑕佹姇鏍�", example = "true")
+ private Boolean needBid;
+
+ @Schema(description = "鍏宠仈鎶曟爣淇濊瘉閲戠紪鍙�", example = "2048")
+ private Long bidBondId;
+ @Schema(description = "鍏宠仈鎶曟爣淇濊瘉閲戝崟鍙�", example = "BZ202611050001")
+ @ExcelProperty("鍏宠仈鎶曟爣鍗曞彿")
+ private String bidBondNo;
+ @Schema(description = "鍏宠仈鎶曟爣鐨勪腑鏍囩粨鏋滐細0 寰呭紑鏍囥��1 宸蹭腑鏍囥��2 鏈腑鏍�", example = "1")
+ private Integer bidResult;
+
+ @Schema(description = "宸叉彁浜ゆ姤浠疯疆娆�", example = "2")
+ @ExcelProperty("鎶ヤ环杞")
+ private Integer revisionNo;
+
+ @Schema(description = "浣滃簾绫诲瀷锛�1 鎵嬪姩浣滃簾銆�2 瓒呮湡浣滃簾", example = "1")
+ private Integer voidType;
+ @Schema(description = "浣滃簾鍘熷洜")
+ @ExcelProperty("浣滃簾鍘熷洜")
+ private String voidReason;
+ @Schema(description = "浣滃簾鏃堕棿")
+ @ExcelProperty("浣滃簾鏃堕棿")
+ private LocalDateTime voidTime;
+ @Schema(description = "浣滃簾浜虹敤鎴风紪鍙�", example = "25682")
+ private Long voidBy;
+ @Schema(description = "浣滃簾浜哄悕瀛�", example = "寮犱笁")
+ @ExcelProperty("浣滃簾浜�")
+ private String voidByName;
+
@Schema(description = "闄勪欢鍒楄〃")
private List<StorageBlobRespDTO> attachmentList;
@@ -141,10 +170,20 @@
private String itemName;
@Schema(description = "鐗╂枡鏉＄爜", example = "BAR001")
private String itemBarCode;
+ @Schema(description = "瑙勬牸鍨嬪彿", example = "M8*20")
+ private String itemSpecification;
@Schema(description = "璁￠噺鍗曚綅缂栧彿", example = "1")
private Long itemUnitId;
@Schema(description = "璁￠噺鍗曚綅鍚嶇О", example = "涓�")
private String itemUnitName;
+ @Schema(description = "杈呭崟浣�1缂栧彿", example = "2")
+ private Long itemUnitId2;
+ @Schema(description = "杈呭崟浣�1鍚嶇О", example = "绠�")
+ private String itemUnitName2;
+ @Schema(description = "杈呭崟浣�2缂栧彿", example = "3")
+ private Long itemUnitId3;
+ @Schema(description = "杈呭崟浣�2鍚嶇О", example = "鎵�")
+ private String itemUnitName3;
@Schema(description = "鐗╂枡鍘熶环", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
private BigDecimal itemPrice;
@@ -169,4 +208,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3