From 3f3a1ed182e96214e66f6456ee692427bf04d454 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 28 十一月 2025 11:10:23 +0800
Subject: [PATCH] yys 1.库存管理导出修改 2.来票登记分页查询修改

---
 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index 56adc8e..10d472a 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -23,14 +23,23 @@
     @ApiModelProperty(value = "閿�鍞骇鍝両D")
     private Long salesLedgerProductId;
 
+    @ApiModelProperty(value = "鐢熶骇鎬婚噺(鍗曚綅kg)")
+    private BigDecimal totalProduction;
+
     @ApiModelProperty(value = "閿�鍞彴璐D")
     private Long salesLedgerId;
 
+    /**
+     * 鐢熶骇鐐掓満
+     */
+    @Excel(name = "鐢熶骇鐐掓満")
+    private String speculativeTradingName;
+
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
-    private String schedulingDateStart;
+    private String entryDateStart;
 
     @ApiModelProperty(value = "缁撴潫鏃堕棿")
-    private String schedulingDateEnd;
+    private String entryDateEnd;
 
     /**
      * id
@@ -96,9 +105,11 @@
     /**
      * 鐘舵��
      */
-    @Excel(name = "鐘舵��")
     @ApiModelProperty(value = "鐘舵��")
     private Integer status;
+
+    @Excel(name = "鐘舵��", readConverterExp = "1=寰呮帓浜�,2=鎺掍骇涓�,3=宸叉帓浜�")
+    private String statusName;
 
     /**
      * 娲惧伐浜�
@@ -125,6 +136,7 @@
      * 宸叉帓浜ф暟閲�
      */
     @ApiModelProperty(value = "宸叉帓浜ф暟閲�")
+    @Excel(name = "宸叉帓浜ф暟閲�")
     private BigDecimal successNum;
 
     private Long tenantId;

--
Gitblit v1.9.3