From 8e4eee5ad4d74e1a4e6ab4de3a9c28000700dce0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:49:04 +0800
Subject: [PATCH] 修复采购退货页面 ERP 模块已禁用报错
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java | 62 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
index d1a01ad..a4aa4a8 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestSaveReqVO.java
@@ -15,7 +15,7 @@
@Data
public class ErpPurchaseRequestSaveReqVO {
- @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @Schema(description = "缂栧彿锛堜慨鏀规椂蹇呭～锛�", example = "1")
private Long id;
@Schema(description = "鐢宠鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -25,53 +25,81 @@
@Schema(description = "鐢宠鐞嗙敱", example = "鐢熶骇闇�瑕�")
private String requestReason;
- @Schema(description = "渚涘簲鍟嗙紪鍙凤紙鍙�夛級", example = "1724")
+ @Schema(description = "閲囪喘鍝佺被锛�1 浠ｇ悊鍟嗗搧 2 鍘熻緟鏂欙級", example = "1")
+ private Integer purchaseCategory;
+
+ @Schema(description = "鐢ㄩ�旇鏄�", example = "杞﹂棿缁翠慨澶囦欢")
+ private String purpose;
+
+ @Schema(description = "鐢宠浜虹紪鍙凤紙涓嶄紶鍒欏彇褰撳墠鐧诲綍鐢ㄦ埛锛�", example = "1")
+ private Long requestUserId;
+
+ @Schema(description = "鐢宠閮ㄩ棬缂栧彿锛堜笉浼犲垯鍙栫敵璇蜂汉鎵�灞為儴闂級", example = "1")
+ private Long requestDeptId;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
private Long supplierId;
- @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", example = "99.88")
+ @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", example = "10")
private BigDecimal discountPercent;
- @Schema(description = "闄勪欢鍦板潃", example = "https://www.iocoder.cn")
- private String fileUrl;
+ @Schema(description = "瀹氶噾閲戦", example = "1000.00")
+ private BigDecimal depositPrice;
- @Schema(description = "澶囨敞", example = "浣犵寽")
+ @Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
- @Schema(description = "鐢宠鏄庣粏鍒楄〃")
- @NotEmpty(message = "鐢宠鏄庣粏鍒楄〃涓嶈兘涓虹┖")
+ @Schema(description = "闄勪欢 blobId 鍒楄〃", example = "[1, 2, 3]")
+ private List<Long> blobIds;
+
+ @Schema(description = "鐢宠鏄庣粏鍒楄〃", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "鐢宠鏄庣粏涓嶈兘涓虹┖")
@Valid
private List<Item> items;
+ @Schema(description = "鐢宠鏄庣粏椤�")
@Data
public static class Item {
- @Schema(description = "鐢宠椤圭紪鍙�", example = "11756")
+ @Schema(description = "缂栧彿锛堜慨鏀规椂蹇呭～锛�", example = "1")
private Long id;
- @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "浜у搧缂栧彿涓嶈兘涓虹┖")
private Long productId;
- @Schema(description = "浜у搧鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
- @NotNull(message = "浜у搧鍗曚綅缂栧彿涓嶈兘涓虹┖")
+ @Schema(description = "浜у搧鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+ @NotNull(message = "浜у搧鍗曚綅涓嶈兘涓虹┖")
private Long productUnitId;
- @Schema(description = "浜у搧鍗曚环锛堝弬鑰冧环锛�", example = "100.00")
+ @Schema(description = "浜у搧鍙傝�冨崟浠�", example = "100.00")
private BigDecimal productPrice;
- @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @Schema(description = "鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "鏁伴噺涓嶈兘涓虹┖")
private BigDecimal count;
- @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13.00")
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13")
private BigDecimal taxPercent;
- @Schema(description = "闇�姹傛棩鏈�", example = "2024-01-01")
+ @Schema(description = "闇�姹傛棩鏈�")
private LocalDate demandTime;
- @Schema(description = "澶囨敞", example = "闅忎究")
+ @Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
+ @Schema(description = "鏄惁闇�瑕佹潵鏂欐楠�", example = "true")
+ private Boolean qcCheckFlag;
+
+ @Schema(description = "浜у搧鍚嶇О锛堝墠绔睍绀虹敤锛屽悗绔拷鐣ワ級", example = "浜у搧A")
+ private String productName;
+
+ @Schema(description = "浜у搧鏉＄爜锛堝墠绔睍绀虹敤锛屽悗绔拷鐣ワ級", example = "12345678")
+ private String productBarCode;
+
+ @Schema(description = "浜у搧鍗曚綅鍚嶇О锛堝墠绔睍绀虹敤锛屽悗绔拷鐣ワ級", example = "涓�")
+ private String productUnitName;
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3