From f4d4d29368ccacb807f93e2033cd4a643a3ddade Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 10:20:28 +0800
Subject: [PATCH] yys 1.修改bug

---
 src/main/java/com/ruoyi/production/pojo/ProductOrder.java |   72 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
index d47062f..e6739fa 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -1,16 +1,31 @@
 package com.ruoyi.production.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.dto.FileDto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @TableName("product_order")
-public class ProductOrder  implements Serializable {
+public class ProductOrder extends FileDto implements Serializable {
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鐢熶骇浠诲姟")
+    private List<ProductProcessRouteItem> processRouteItems;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鐗╂枡娓呭崟")
+    private List<ProductStructureRecord> productStructureRecords;
 
     private static final long serialVersionUID = 1L;
 
@@ -24,13 +39,19 @@
     private Long salesLedgerId;
 
     /**
-     * 閿�鍞彴璐︿骇鍝乮d
+     * 閿�鍞彴璐︿骇鍝乮d(sales_ledger_product)
      */
     @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+    private Long saleLedgerProductId;
+
+    /**
+     * 浜у搧瑙勬牸id
+     */
+    @ApiModelProperty(value = "浜у搧瑙勬牸id")
     private Long productModelId;
 
     /**
-     * 宸ヨ壓璺嚎id
+     * 妯＄増鐨勫伐鑹鸿矾绾縤d
      */
     @ApiModelProperty(value = "宸ヨ壓璺嚎id")
     private Long routeId;
@@ -39,6 +60,7 @@
      * 鐢熶骇璁㈠崟鍙�
      */
     @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+    @Excel(name = "鐢熶骇璁㈠崟鍙�")
     private String npsNo;
 
     /**
@@ -51,11 +73,53 @@
     //鍒涘缓鏃堕棿
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鍒涘缓鏃堕棿")
     private LocalDateTime createTime;
 
     //淇敼鏃堕棿
     @ApiModelProperty(value = "淇敼鏃堕棿")
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+
+    /**
+     * 闇�姹傛暟閲�
+     */
+    @ApiModelProperty(value = "闇�姹傛暟閲�")
+    @Excel(name = "闇�姹傛暟閲�")
+    private BigDecimal quantity;
+
+    /**
+     * 瀹屾垚鏁伴噺
+     */
+    @ApiModelProperty(value = "瀹屾垚鏁伴噺")
+    @Excel(name = "瀹屾垚鏁伴噺")
+    private BigDecimal completeQuantity;
+
+    @Excel(name = "寮�濮嬫椂闂�")
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    @Excel(name = "缁撴潫鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty("浜や粯鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd",shape = JsonFormat.Shape.STRING,timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "浜や粯鏃ユ湡")
+    private LocalDate deliveryDate;
+
+    @ApiModelProperty("鐘舵�� 寰呯敓浜� 鐢熶骇涓� 宸插畬鎴�")
+    @Excel(name = "鐘舵��")
+    private String status;
+
 }

--
Gitblit v1.9.3