From 8168aef3c7557c9e1361892270a1ebe35dbddba5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 11:42:19 +0800
Subject: [PATCH] refactor(erp): 采购申请与询价比价流程重构
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
index 74ff12b..50c373a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java
@@ -64,17 +64,9 @@
@ExcelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
- @Schema(description = "瀹氶噾閲戦", example = "1000.00")
- @ExcelProperty("瀹氶噾閲戦")
- private BigDecimal depositPrice;
-
@Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("鍚堣鏁伴噺")
private BigDecimal totalCount;
-
- @Schema(description = "鍚堣浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鍚堣浠锋牸")
- private BigDecimal totalPrice;
@Schema(description = "浜у搧鍚嶇О鍒楄〃", example = "浜у搧A,浜у搧B")
@ExcelProperty("浜у搧鍚嶇О鍒楄〃")
@@ -87,6 +79,14 @@
@Schema(description = "鐢熸垚鐨勯噰璐鍗曞彿", example = "CGDD001")
@ExcelProperty("閲囪喘璁㈠崟鍙�")
private String orderNo;
+
+ @Schema(description = "鍏宠仈璇环鍗曠紪鍙�", example = "1")
+ @ExcelIgnore
+ private Long inquiryId;
+
+ @Schema(description = "鍏宠仈璇环鍗曞彿", example = "XJ2026110001")
+ @ExcelProperty("璇环鍗曞彿")
+ private String inquiryNo;
@Schema(description = "鍏ュ簱鐘舵��", example = "0")
@ExcelProperty(value = "鍏ュ簱鐘舵��", converter = cn.iocoder.yudao.module.erp.convert.ErpPurchaseOrderInStatusConvert.class)
@@ -130,20 +130,8 @@
@Schema(description = "浜у搧鍗曚綅鍚嶇О", example = "涓�")
private String productUnitName;
- @Schema(description = "浜у搧鍙傝�冨崟浠�", example = "100.00")
- private BigDecimal productPrice;
-
@Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private BigDecimal count;
-
- @Schema(description = "鎬讳环", example = "1000.00")
- private BigDecimal totalPrice;
-
- @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13")
- private BigDecimal taxPercent;
-
- @Schema(description = "绋庨", example = "130.00")
- private BigDecimal taxPrice;
@Schema(description = "闇�姹傛棩鏈�")
private LocalDate demandTime;
--
Gitblit v1.9.3