From ca9c106255ff6283286c78ce621251839eb98189 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 23 三月 2026 16:00:38 +0800
Subject: [PATCH] feat(process): 新增工序机台字段及关联机台校验

---
 src/main/java/com/ruoyi/production/pojo/ProductProcess.java |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index 01ed986..249e039 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -1,14 +1,23 @@
 package com.ruoyi.production.pojo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+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;
 
 @TableName("product_process")
 @Data
-public class ProductProcess {
+@ExcelIgnoreUnannotated
+@ApiModel(value = "productProcess", description = "宸ュ簭琛�")
+public class ProductProcess implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -16,36 +25,60 @@
     private Long id;
 
     /**
+     * 璁惧鍙拌处id
+     */
+//    @Excel(name = "璁惧鍙拌处id")
+    private Long deviceLeaderId;
+
+    /**
      * 宸ュ簭鍚嶇О
      */
+    @Excel(name = "宸ュ簭鍚嶇О")
     private String name;
+
+    @ApiModelProperty(value ="宸ュ簭鏈哄彴")
+    @TableField(value = "device_name")
+    @Excel(name = "宸ュ簭鏈哄彴")
+    private String deviceName;
 
     /**
      * 宸ュ簭缂栧彿
      */
+//    @Excel(name = "宸ュ簭缂栧彿")
     private String no;
 
     /**
      * 澶囨敞
      */
+    @Excel(name = "澶囨敞")
     private String remark;
 
 
     /**
      * 宸ヨ祫瀹氶
      */
+    @Excel(name = "宸ヨ祫瀹氶")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal salaryQuota;
+
+    @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+    @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
+    private Long type;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
      * 淇敼鏃堕棿
      */
-    @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;
 
     /**
@@ -54,5 +87,13 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    @ApiModelProperty(value ="鏄惁璐ㄦ")
+    @Excel(name = "鏄惁璐ㄦ")
+    private Boolean isQuality;
 
+
+
+    @ApiModelProperty(value ="璁惧id")
+    @TableField(value = "device_id")
+    private Long deviceId;
 }

--
Gitblit v1.9.3