From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java b/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
new file mode 100644
index 0000000..c5166f9
--- /dev/null
+++ b/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
@@ -0,0 +1,62 @@
+package com.ruoyi.sales.vo;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ShippingNoteVo {
+ @Excel(name = "瀹㈡埛鍚嶇О", cellType = Excel.ColumnType.STRING)
+ private String customerName;
+
+ @Excel(name = "閫佽揣鍦板潃", cellType = Excel.ColumnType.STRING)
+ private String companyAddress;
+
+ @Excel(name = "鑱旂郴浜�", cellType = Excel.ColumnType.STRING)
+ private String contactPerson;
+
+ @Excel(name = "鑱旂郴鐢佃瘽", cellType = Excel.ColumnType.STRING)
+ private String contactPhone;
+
+ @Excel(name = "鍏徃鐢佃瘽", cellType = Excel.ColumnType.STRING)
+ private String companyPhone;
+
+ @Excel(name = "鍗曟嵁缂栧彿", cellType = Excel.ColumnType.STRING)
+ private String salesContractNo;
+
+ @Excel(name = "閫佽揣鏃ユ湡", cellType = Excel.ColumnType.STRING)
+ private String deliveryDate;
+
+ @Excel(name = "浜у搧淇℃伅", type = Excel.Type.EXPORT)
+ 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