From 2cffa027595247c136a8ee95f5f745c58cb0cce5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 13:08:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index bc805bc..e52ee9d 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -36,6 +37,7 @@
private Long productModelId;
@Schema(description = "鐢熶骇璁㈠崟鍙�")
+ @Excel(name = "鐢熶骇璁㈠崟",sort = 0)
private String npsNo;
@Schema(description = "褰曞叆鏃堕棿")
@@ -50,15 +52,19 @@
private Long technologyRoutingId;
@Schema(description = "闇�姹傛暟閲忋�傛墜鍔ㄦ柊澧炴椂蹇呭～涓斿繀椤诲ぇ浜� 0锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
+ @Excel(name = "闇�姹傛暟閲�",sort = 5)
private BigDecimal quantity;
@Schema(description = "瀹屾垚鏁伴噺")
+ @Excel(name = "瀹屾垚鏁伴噺",sort = 6)
private BigDecimal completeQuantity;
@Schema(description = "寮�濮嬫棩鏈�")
+ @Excel(name = "寮�濮嬫棩鏈�",sort = 8,dateFormat = "yyyy-MM-dd")
private LocalDateTime startTime;
@Schema(description = "缁撴潫鏃ユ湡")
+ @Excel(name = "缁撴潫鏃ユ湡",sort = 9,dateFormat = "yyyy-MM-dd")
private LocalDateTime endTime;
@Schema(description = "鍒涘缓浜篒D")
@@ -69,12 +75,17 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @Schema(description = "璁″垝瀹屾垚鏃堕棿銆傞�夊～锛涙寜鐢熶骇璁″垝鐢熸垚璁㈠崟鏃讹紝绯荤粺浼氫紭鍏堣嚜鍔ㄥ甫鍑轰氦鏈熴��")
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璁″垝瀹屾垚鏃堕棿",sort = 10,dateFormat = "yyyy-MM-dd")
private LocalDate planCompleteTime;
- @Schema(description = "鐘舵�侊紙1.寰呭紑濮嬨��2.杩涜涓��3.宸插畬鎴愩��4.宸插彇娑堬級")
+ @Schema(description = "鐘舵�侊紙1.寰呭紑濮� 2.杩涜涓� 3.宸插畬鎴� 4.宸插彇娑� 5.宸茬粨鏉燂級")
+ @Excel(name = "鐘舵��",sort = 1,readConverterExp = "1=寰呭紑濮�,2=杩涜涓�,3=宸插畬鎴�,4=宸插彇娑�,5=宸茬粨鏉�")
private Integer status;
+ @Schema(description = "鏄惁缁撴潫锛�")
+ @TableField("is_end_order")
+ private Boolean endOrder;
}
--
Gitblit v1.9.3