From 6d5ce70c3e2b536c8e4b74269be70029a57cb1cc Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 11 五月 2026 15:36:32 +0800
Subject: [PATCH] feat(approve): 使用通用工具类优化审批流程ID生成逻辑
---
src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java b/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
index fc22574..c5166f9 100644
--- a/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
+++ b/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
@@ -4,6 +4,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -30,6 +31,32 @@
private String deliveryDate;
@Excel(name = "浜у搧淇℃伅", type = Excel.Type.EXPORT)
- private List<SalesLedgerProduct> products;
+ private List<SalesLedgerProductVo> products;
+ @Excel(name = "鍚堣鏁伴噺", cellType = Excel.ColumnType.NUMERIC)
+ private BigDecimal totalQuantity;
+
+ @Data
+ public static class SalesLedgerProductVo {
+ @Excel(name = "搴忓彿", cellType = Excel.ColumnType.NUMERIC)
+ private Integer serialNumber;
+
+ @Excel(name = "鐗╂枡缂栧彿", cellType = Excel.ColumnType.STRING)
+ private String materialCode;
+
+ @Excel(name = "浜у搧绫诲埆", cellType = Excel.ColumnType.STRING)
+ private String productCategory;
+
+ @Excel(name = "瑙勬牸鍨嬪彿", cellType = Excel.ColumnType.STRING)
+ private String specificationModel;
+
+ @Excel(name = "鍗曚綅", cellType = Excel.ColumnType.STRING)
+ private String unit;
+
+ @Excel(name = "鏁伴噺", cellType = Excel.ColumnType.NUMERIC)
+ private BigDecimal quantity;
+
+ @Excel(name = "璁㈠崟鍙�", cellType = Excel.ColumnType.STRING)
+ private String orderNo;
+ }
}
--
Gitblit v1.9.3