From 6ad5c2cdc193cf7bb02884961b7434cd7f607a0d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 16 四月 2026 10:48:09 +0800
Subject: [PATCH] feat(production): 扩展生产工艺路线支持多产品绑定及工单权限控制

---
 src/main/java/com/ruoyi/production/pojo/ProductOrder.java |   73 ++++++++++++++++++++++++++----------
 1 files changed, 52 insertions(+), 21 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..3e6fe55 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductOrder.java
@@ -1,61 +1,92 @@
 package com.ruoyi.production.pojo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.Api;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 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")
-public class ProductOrder  implements Serializable {
+public class ProductOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    /**
-     * 閿�鍞彴璐d
-     */
     @ApiModelProperty(value = "閿�鍞彴璐d")
     private Long salesLedgerId;
 
-    /**
-     * 閿�鍞彴璐︿骇鍝乮d
-     */
     @ApiModelProperty(value = "閿�鍞彴璐︿骇鍝乮d")
+    private Long saleLedgerProductId;
+
+    @ApiModelProperty(value = "浜у搧瑙勬牸id")
     private Long productModelId;
 
-    /**
-     * 宸ヨ壓璺嚎id
-     */
     @ApiModelProperty(value = "宸ヨ壓璺嚎id")
     private Long routeId;
 
-    /**
-     * 鐢熶骇璁㈠崟鍙�
-     */
     @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+    @Excel(name = "鐢熶骇璁㈠崟鍙�")
     private String npsNo;
 
-    /**
-     * 绉熸埛id
-     */
     @ApiModelProperty(value = "绉熸埛id")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
-    //鍒涘缓鏃堕棿
     @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;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍓嶇浼犲叆鐨勫伐搴忓垪琛�")
+    private List<ProductProcessRouteItem> processRouteItems;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍓嶇浼犲叆鐨勫伐鑹鸿矾绾跨紪鍙�")
+    private String processRouteCode;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍓嶇浼犲叆鐨凚OM id")
+    private Integer bomId;
 }

--
Gitblit v1.9.3