From 0ca7d78f0e8e8a6984314803aba21ab1d25472b3 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 24 四月 2026 15:06:21 +0800
Subject: [PATCH] feat(production): 新增印刷定印单实体及相关接口和分页信息完善

---
 src/main/java/com/ruoyi/production/dto/ProductOrderDto.java |   53 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index d5dd777..1d7d48b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -1,6 +1,7 @@
 package com.ruoyi.production.dto;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.production.pojo.ProductOrder;
@@ -10,53 +11,87 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Data
 @ExcelIgnoreUnannotated
 public class ProductOrderDto extends ProductOrder {
 
     @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
-    @Excel(name = "閿�鍞悎鍚屽彿")
+    @Excel(name = "鍗曞彿",sort = 2)
     private String salesContractNo;
 
     @ApiModelProperty(value = "椤圭洰鍚�")
-    @Excel(name = "椤圭洰鍚�")
     private String projectName;
 
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
-    @Excel(name = "瀹㈡埛鍚嶇О")
+    @Excel(name = "鍘傚",sort = 3)
     private String customerName;
 
     @ApiModelProperty(value = "浜у搧鍚嶇О")
-    @Excel(name = "浜у搧鍚嶇О")
+    @Excel(name = "浜у搧鍚嶇О",sort = 4)
     private String productCategory;
 
     @ApiModelProperty(value = "瑙勬牸")
-    @Excel(name = "瑙勬牸")
+    @Excel(name = "绾稿紶瑙勬牸",sort = 5)
     private String specificationModel;
 
     @ApiModelProperty(value = "宸ヨ壓璺嚎缂栧彿")
-    @Excel(name = "宸ヨ壓璺嚎缂栧彿")
     private String processRouteCode;
 
     @ApiModelProperty(value = "瀹屾垚杩涘害")
-    @Excel(name = "瀹屾垚杩涘害", suffix = "%")
     private BigDecimal completionStatus;
 
     @ApiModelProperty(value = "BOM缂栧彿")
-    @Excel(name = "BOM缂栧彿")
     private String bomNo;
 
     @ApiModelProperty(value = "浜ゆ湡鍋忓樊")
     private Integer deliveryDaysDiff;
 
-    @ApiModelProperty(value = "浜ゆ湡")
+    @ApiModelProperty(value = "璁″垝浜よ揣鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "璁″垝浜よ揣鏃ユ湡",sort = 10)
     private LocalDate deliveryDate;
+
+    @ApiModelProperty(value = "瀹為檯浜よ揣鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "瀹為檯浜よ揣鏃ユ湡",sort = 11)
+    private LocalDateTime actuallyDeliveryDate;
+
+    @ApiModelProperty(value = "绛捐鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "涓嬪崟鏃ユ湡",sort = 1)
+    private LocalDate executionDate;
 
     //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
     private Boolean isFh;
 
     private Long saleLedgerId;
+
+    /**
+     * 灏哄
+     */
+    private String cutSize;
+
+    /**
+     * 灏忕洅鏁伴噺
+     */
+    @Excel(name = "灏忕洅鏁伴噺",sort = 7)
+    private String smallBoxQty;
+
+    /**
+     * 涓洅鏁伴噺
+     */
+    @Excel(name = "灏忕洅鏁伴噺",sort = 8)
+    private String mediumBoxQty;
+
+    /**
+     * 鑹叉暟
+     */
+    @Excel(name = "鑹叉暟",sort = 9)
+    private String printColorCount;
+
 }

--
Gitblit v1.9.3