From beb66826d7ca7faae90d03b5e0d21c882f5c9750 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 三月 2026 13:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/production/pojo/ProductOrder.java |   66 ++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 14 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..0e06718 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -1,12 +1,17 @@
 package com.ruoyi.production.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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.LocalDateTime;
+import java.util.List;
 
 @Data
 @TableName("product_order")
@@ -18,19 +23,7 @@
     private Long id;
 
     /**
-     * 閿�鍞彴璐d
-     */
-    @ApiModelProperty(value = "閿�鍞彴璐d")
-    private Long salesLedgerId;
-
-    /**
-     * 閿�鍞彴璐︿骇鍝乮d
-     */
-    @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
-    private Long productModelId;
-
-    /**
-     * 宸ヨ壓璺嚎id
+     * 妯＄増鐨勫伐鑹鸿矾绾縤d
      */
     @ApiModelProperty(value = "宸ヨ壓璺嚎id")
     private Long routeId;
@@ -39,7 +32,22 @@
      * 鐢熶骇璁㈠崟鍙�
      */
     @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+    @Excel(name = "鐢熶骇璁㈠崟鍙�")
     private String npsNo;
+
+    /**
+     * 鍚堝苟鐢熶骇璁″垝ids
+     */
+    @ApiModelProperty(value = "鍚堝苟鐢熶骇璁″垝ids")
+    private String combineProductionPlanIds;
+
+    /**
+     * 璁″垝瀹屾垚鏃堕棿
+     */
+    @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime planCompleteTime;
 
     /**
      * 绉熸埛id
@@ -51,11 +59,41 @@
     //鍒涘缓鏃堕棿
     @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;
 }

--
Gitblit v1.9.3