From 52e4610b008f7643f84c5f37a110c081123caf69 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 08 一月 2026 09:29:01 +0800
Subject: [PATCH] 报工后新增/修改生产核算;删除报工后,删除关联的核算数据

---
 src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 9a8088a..3dbe688 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -1,9 +1,6 @@
 package com.ruoyi.production.pojo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,7 +10,7 @@
 @TableName("production_product_main")
 public class ProductionProductMain {
 
-    @TableId
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     @ApiModelProperty(value = "鎶ュ伐鍗曞彿")
@@ -22,8 +19,14 @@
     @ApiModelProperty(value = "鎶ュ伐浜哄憳id")
     private Long userId;
 
+    @ApiModelProperty(value = "鎶ュ伐浜哄憳")
+    private String userName;
+
+    @ApiModelProperty(value = "鐢熶骇椤圭洰id")
+    private Long productProcessRouteItemId;
+
     @ApiModelProperty(value = "宸ュ崟id")
-    private String productProcessRouteItemId;
+    private Long workOrderId;
 
     @ApiModelProperty(value = "鎶ュ伐鐘舵��")
     private Integer status;
@@ -32,6 +35,10 @@
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
+    @ApiModelProperty(value = "鏇存柊鏃堕棿")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+
     @ApiModelProperty(value = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;

--
Gitblit v1.9.3