From 2ee9e158e3129070f6b1fd953da1540f05d4f2b0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 10 七月 2026 18:04:50 +0800
Subject: [PATCH] 修改报工

---
 src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 0002b5b..c485cd0 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -7,6 +7,7 @@
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -26,17 +27,23 @@
     @Schema(description = "鎶ュ伐浜哄憳")
     private String userName;
 
-    @Schema(description = "鐢熶骇椤圭洰id")
-    private Long productProcessRouteItemId;
-
-    @Schema(description = "宸ュ崟id")
-    private Long workOrderId;
-
     @Schema(description = "鐢熶骇宸ュ簭宸ュ崟id")
     private Long productionOperationTaskId;
 
     @Schema(description = "鎶ュ伐鐘舵��")
     private Integer status;
+
+    @Schema(description = "鎶ュ伐缁撴灉绫诲瀷锛�0鍚堟牸锛�1杞诲井杩斿伐锛�2涓ラ噸杩斿伐锛�3鎶ュ簾")
+    @TableField("report_type")
+    private Integer reportType;
+
+    @Schema(description = "瀹℃牳鐘舵�侊細0寰呭鏍革紝1瀹℃牳閫氳繃锛�2瀹℃牳涓嶉�氳繃")
+    @TableField("audit_status")
+    private Integer auditStatus;
+
+    @Schema(description = "瀹℃牳鎰忚")
+    @TableField("audit_remark")
+    private String auditRemark;
 
     @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
@@ -51,9 +58,6 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
-    @Schema(description = "绉熸埛ID")
-    @TableField(fill = FieldFill.INSERT)
-    private Long tenantId;
     @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
@@ -65,4 +69,7 @@
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
 
+    @Schema(description = "宸ユ椂")
+    private BigDecimal workHour;
+
 }

--
Gitblit v1.9.3