From 5140e16bd1cb2bdf974d47a4342f9e27ef804655 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 18 七月 2026 15:54:07 +0800
Subject: [PATCH] feat(erp): 增加销售订单MPS集成与发货通知单控制功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestRespVO.java | 122 ++++++++++++++++------------------------
1 files changed, 48 insertions(+), 74 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 47ee75e..40fcab4 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
@@ -1,155 +1,129 @@
package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request;
-import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.List;
@Schema(description = "绠＄悊鍚庡彴 - ERP 閲囪喘鐢宠 Response VO")
@Data
-@ExcelIgnoreUnannotated
public class ErpPurchaseRequestRespVO {
- @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
- @ExcelProperty("缂栧彿")
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long id;
@Schema(description = "閲囪喘鐢宠鍗曞彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "CGSQ001")
- @ExcelProperty("閲囪喘鐢宠鍗曞彿")
private String no;
- @Schema(description = "瀹℃壒鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "20")
- @ExcelProperty("瀹℃壒鐘舵��")
+ @Schema(description = "鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
private Integer status;
@Schema(description = "鐢宠浜虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long requestUserId;
- @Schema(description = "鐢宠浜哄悕绉�", example = "寮犱笁")
- @ExcelProperty("鐢宠浜�")
+
+ @Schema(description = "鐢宠浜哄鍚�", example = "寮犱笁")
private String requestUserName;
@Schema(description = "鐢宠閮ㄩ棬缂栧彿", example = "1")
private Long requestDeptId;
+
@Schema(description = "鐢宠閮ㄩ棬鍚嶇О", example = "鐢熶骇閮�")
- @ExcelProperty("鐢宠閮ㄩ棬")
private String requestDeptName;
@Schema(description = "鐢宠鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鐢宠鏃堕棿")
private LocalDateTime requestTime;
@Schema(description = "鐢宠鐞嗙敱", example = "鐢熶骇闇�瑕�")
- @ExcelProperty("鐢宠鐞嗙敱")
private String requestReason;
- @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1724")
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1")
private Long supplierId;
+
@Schema(description = "渚涘簲鍟嗗悕绉�", example = "渚涘簲鍟咥")
- @ExcelProperty("渚涘簲鍟嗗悕绉�")
private String supplierName;
- @Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
- @ExcelProperty("鍚堣鏁伴噺")
+ @Schema(description = "瀹氶噾閲戦", example = "1000.00")
+ private BigDecimal depositPrice;
+
+ @Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED)
private BigDecimal totalCount;
- @Schema(description = "鍚堣浜у搧浠锋牸", example = "10000.00")
- private BigDecimal totalProductPrice;
-
- @Schema(description = "鍚堣绋庨", example = "1300.00")
- private BigDecimal totalTaxPrice;
-
- @Schema(description = "鏈�缁堝悎璁′环鏍�", requiredMode = Schema.RequiredMode.REQUIRED, example = "11300.00")
- @ExcelProperty("鏈�缁堝悎璁′环鏍�")
+ @Schema(description = "鍚堣浠锋牸", requiredMode = Schema.RequiredMode.REQUIRED)
private BigDecimal totalPrice;
- @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", example = "10.00")
- private BigDecimal discountPercent;
+ @Schema(description = "浜у搧鍚嶇О鍒楄〃", example = "浜у搧A,浜у搧B")
+ private String productNames;
- @Schema(description = "浼樻儬閲戦", example = "1130.00")
- private BigDecimal discountPrice;
-
- @Schema(description = "宸ヤ綔娴佺紪鍙�", example = "xxx-xxx")
- private String processInstanceId;
-
- @Schema(description = "鍏宠仈閲囪喘璁㈠崟缂栧彿", example = "100")
+ @Schema(description = "鐢熸垚鐨勯噰璐鍗曠紪鍙�", example = "1")
private Long orderId;
- @Schema(description = "鍏宠仈閲囪喘璁㈠崟鍗曞彿", example = "CGDD001")
- @ExcelProperty("閲囪喘璁㈠崟鍗曞彿")
+
+ @Schema(description = "鐢熸垚鐨勯噰璐鍗曞彿", example = "CGDD001")
private String orderNo;
- @Schema(description = "鐢熸垚閲囪喘璁㈠崟鏃堕棿")
- private LocalDateTime orderTime;
+ @Schema(description = "鍏ュ簱鐘舵�侊紙0:鏈叆搴� 1:閮ㄥ垎鍏ュ簱 2:鍏ㄩ儴鍏ュ簱锛�", example = "0")
+ private Integer inStatus;
- @Schema(description = "闄勪欢鍦板潃", example = "https://www.iocoder.cn")
- @ExcelProperty("闄勪欢鍦板潃")
+ @Schema(description = "闄勪欢鍦板潃", example = "https://xxx.com/xxx.pdf")
private String fileUrl;
- @Schema(description = "澶囨敞", example = "浣犵寽")
- @ExcelProperty("澶囨敞")
+ @Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
- @Schema(description = "鍒涘缓浜�", example = "1")
- private String creator;
- @Schema(description = "鍒涘缓浜哄悕绉�", example = "鑺嬮亾")
- private String creatorName;
-
- @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
- @ExcelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
@Schema(description = "鐢宠鏄庣粏鍒楄〃")
- private List<Item> items;
+ private java.util.List<Item> items;
- @Schema(description = "浜у搧淇℃伅")
- @ExcelProperty("浜у搧淇℃伅")
- private String productNames;
-
+ @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")
private Long productId;
- @Schema(description = "浜у搧鍗曚綅缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @Schema(description = "浜у搧鍚嶇О", example = "浜у搧A")
+ private String productName;
+
+ @Schema(description = "浜у搧鏉＄爜", example = "12345678")
+ private String productBarCode;
+
+ @Schema(description = "浜у搧鍗曚綅缂栧彿", example = "1")
private Long productUnitId;
- @Schema(description = "浜у搧鍗曚环锛堝弬鑰冧环锛�", example = "100.00")
+ @Schema(description = "浜у搧鍗曚綅鍚嶇О", example = "涓�")
+ private String productUnitName;
+
+ @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")
private BigDecimal count;
- @Schema(description = "鎬讳环", example = "10000.00")
+ @Schema(description = "鎬讳环", example = "1000.00")
private BigDecimal totalPrice;
- @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13.00")
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "13")
private BigDecimal taxPercent;
- @Schema(description = "绋庨", example = "1300.00")
+ @Schema(description = "绋庨", example = "130.00")
private BigDecimal taxPrice;
- @Schema(description = "闇�姹傛棩鏈�", example = "2024-01-01")
- private LocalDate demandTime;
+ @Schema(description = "闇�姹傛棩鏈�")
+ private LocalDateTime demandTime;
- @Schema(description = "澶囨敞", example = "闅忎究")
+ @Schema(description = "澶囨敞", example = "澶囨敞")
private String remark;
- // ========== 鍏宠仈瀛楁 ==========
+ @Schema(description = "鏄惁闇�瑕佹潵鏂欐楠�", example = "true")
+ private Boolean qcCheckFlag;
- @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "宸у厠鍔�")
- private String productName;
- @Schema(description = "浜у搧鏉＄爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
- private String productBarCode;
- @Schema(description = "浜у搧鍗曚綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐩�")
- private String productUnitName;
+ @Schema(description = "鍏ュ簱鏁伴噺", example = "10.00")
+ private BigDecimal inCount;
}
--
Gitblit v1.9.3