From 9cc63cdfca263d07f33a30964ecb48f339ab7a3e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 17 一月 2026 15:48:25 +0800
Subject: [PATCH] 生产核算和生产报工的导出
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index f6aa5ba..843e4a6 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,28 +1,45 @@
package com.ruoyi.production.dto;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductionProductMain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
+@ExcelIgnoreUnannotated
public class ProductionProductMainDto extends ProductionProductMain {
@ApiModelProperty(value = "宸ュ崟缂栧彿")
+ @Excel(name = "宸ュ崟缂栧彿")
private String workOrderNo;
@ApiModelProperty(value = "宸ュ崟鐘舵��")
private String workOrderStatus;
@ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
+ @Excel(name = "鎶ュ伐浜�")
private String nickName;
@ApiModelProperty(value = "鎶ュ伐鏁伴噺")
+ @Excel(name = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty(value = "鏄惁鎶ュ伐")
- private boolean reportWork;
+ //浜у搧鍚嶇О
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
- @ApiModelProperty(value = "鎶ュ伐id")
- private Long productMainId;
+ //浜у搧瑙勬牸鍨嬪彿
+ @Excel(name = "浜у搧瑙勬牸鍨嬪彿")
+ private String productModelName;
+
+ //鍗曚綅
+ @Excel(name = "鍗曚綅")
+ private String unit;
+
+ //閿�鍞悎鍚屽彿
+ @Excel(name = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
}
--
Gitblit v1.9.3