From 341341d5e02d1845ffce081b591779a578513262 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 16 十二月 2025 11:46:10 +0800
Subject: [PATCH] 材料出库增加物品类型

---
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index b0d8cad..bc319ac 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -14,7 +14,28 @@
 @Data
 public class ProcurementRecordOutPageDto {
 
+    @Excel(name = "鍑哄簱缂栧彿")
+    private String code;
+
     private Integer id;
+
+    private BigDecimal warnNum;
+    /**
+     * 閿�鍞悎鍚屽彿
+     */
+    private String salesContractNo;
+
+    /**
+     * 瀹㈡埛鍚堝悓鍙�
+     */
+    private String customerContractNo;
+
+    /**
+     * 瀹㈡埛鍚嶇О
+     */
+    @Excel(name = "瀹㈡埛鍚嶇О")
+    private String customerName;
+
 
     /**
      * 鍑哄叆搴撴暟閲�
@@ -25,9 +46,14 @@
     /**
      * 鍑哄叆搴撴椂闂�
      */
+//    @Excel(name = "鍑哄簱鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
+    private String timeStr;
+
     @Excel(name = "鍑哄簱鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime createDate;
+    private String time;
 
     /**
      * 鍑哄叆搴撶敤鎴�
@@ -40,6 +66,8 @@
      */
     @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
+
+
 
 
     /**
@@ -84,4 +112,8 @@
     @Excel(name = "涓嶅惈绋庢�讳环")
     private BigDecimal taxExclusiveTotalPrice;
 
+    /**
+     * 鐗╁搧绫诲瀷
+     */
+    private String itemType;
 }

--
Gitblit v1.9.3