From 4153cdc177ec3d8879ad210178ffc20ee0a2eee0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 一月 2026 16:39:32 +0800
Subject: [PATCH] 删除报工联动，优化报工

---
 src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java |   80 +++++++++++++++++++++++++++++++++------
 1 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
index bffa732..0715535 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductWorkOrder.java
@@ -5,14 +5,23 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+/**
+ * 浜у搧宸ュ崟瀹炰綋绫�
+ * 瀵瑰簲鏁版嵁搴撹〃锛歱roduct_work_order
+ */
 @Data
 @TableName("product_work_order")
 public class ProductWorkOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 涓婚敭id
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
@@ -23,16 +32,30 @@
     private Long productProcessRouteItemId;
 
     /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
      * 宸ュ崟缂栧彿
      */
-    @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+    @ApiModelProperty(value = "宸ュ崟缂栧彿")
     private String workOrderNo;
 
     /**
-     * 鐢熶骇鐘舵�� 1 寰呯‘璁�  2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�
+     * 鐘舵��  1 寰呯‘璁�  2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�
      */
-    @ApiModelProperty(value = "鐢熶骇鐘舵�� 1 寰呯‘璁�  2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
-    private String status;
+    @ApiModelProperty(value = "鐘舵��  1 寰呯‘璁�  2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜�")
+    private Integer status;
 
     /**
      * 绉熸埛id
@@ -41,14 +64,45 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
-    //鍒涘缓鏃堕棿
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createTime;
+    /**
+     * 璁″垝寮�濮嬫椂闂�
+     */
+    @ApiModelProperty(value = "璁″垝寮�濮嬫椂闂�")
+    private LocalDate planStartTime;
 
-    //淇敼鏃堕棿
-    @ApiModelProperty(value = "淇敼鏃堕棿")
-    @TableField(fill = FieldFill.UPDATE)
-    private LocalDateTime updateTime;
+    /**
+     * 璁″垝缁撴潫鏃堕棿
+     */
+    @ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
+    private LocalDate planEndTime;
 
-}
+    /**
+     * 瀹為檯寮�濮嬫椂闂�
+     */
+    @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�")
+    private LocalDate actualStartTime;
+
+    /**
+     * 瀹為檯缁撴潫鏃堕棿
+     */
+    @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿")
+    private LocalDate actualEndTime;
+
+    /**
+     * 鏄惁鎶ュ伐
+     */
+    @ApiModelProperty(value = "鏄惁鎶ュ伐")
+    private boolean reportWork;
+
+    /**
+     * 瀹為檯鏁伴噺
+     */
+    @ApiModelProperty(value = "鏁伴噺")
+    private BigDecimal quantity;
+
+    /**
+     * 鎶ュ伐id
+     */
+    @ApiModelProperty(value = "鎶ュ伐id")
+    private Long productMainId;
+}
\ No newline at end of file

--
Gitblit v1.9.3