From 0febd1ea7218cf2ae28cad07912bf6ba7b881d2c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 15:00:39 +0800
Subject: [PATCH] Merge branch 'dev_tide_gybjyhglxt' into dev_tide_gybjyhglxt_xindao
---
src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
index bf9e9d5..5b5fae8 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
@@ -1,11 +1,11 @@
package com.ruoyi.production.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
-import java.time.LocalDate;
/**
* @author :yys
@@ -27,6 +27,7 @@
* 鎺掍骇浜哄悕绉�
*/
@ApiModelProperty(value = "鎺掍骇浜哄悕绉�")
+ @Excel(name = "鎺掍骇浜�")
private String schedulingUserName;
@@ -34,13 +35,22 @@
* 鎺掍骇鏁伴噺
*/
@ApiModelProperty(value = "鎺掍骇鏁伴噺")
+ @Excel(name = "鎺掍骇鏁伴噺")
private BigDecimal schedulingNum;
/**
* 鐢熶骇鏁伴噺
*/
@ApiModelProperty(value = "鐢熶骇鏁伴噺")
+ @Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal finishedNum;
+
+ /**
+ * 寰呯敓浜ф暟閲�
+ */
+ @ApiModelProperty(value = "寰呯敓浜ф暟閲�")
+ @Excel(name = "寰呯敓浜ф暟閲�")
+ private BigDecimal daiNum;
/**
* 宸ユ椂瀹氶
@@ -52,17 +62,19 @@
* 宸ュ簭
*/
@ApiModelProperty(value = "宸ュ簭")
+ @Excel(name = "宸ュ簭")
private String process;
/**
* 鎺掍骇鏃ユ湡
*/
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
+ @Excel(name = "鎺掍骇鏃ユ湡")
private String schedulingDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private String schedulingDateStart;
+ private String entryDateStart;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String schedulingDateEnd;
+ private String entryDateEnd;
/**
* 鎶ュ伐鐘舵�侊紙1-寰呯敓浜� 2-宸叉姤宸ワ級
@@ -70,4 +82,32 @@
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
+ @Excel(name = "鐘舵��", readConverterExp = "1=寰呯敓浜�,2=鐢熶骇涓�,3=宸叉姤宸�")
+ private String statusName;
+
+ /**
+ * 鍙ｅ懗鍒嗙被
+ */
+ @ApiModelProperty(value = "鍙ｅ懗鍒嗙被")
+ private String type;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ /**
+ * 鎹熻��
+ */
+ @ApiModelProperty(value = "鎹熻��")
+ private String loss;
+
+ /**
+ * 棰嗙敤
+ */
+ @ApiModelProperty(value = "棰嗙敤")
+ private String receive;
+
+
}
--
Gitblit v1.9.3