From bb091407c5920e4071b476e72fbb14638fac3865 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 23 三月 2026 17:26:42 +0800
Subject: [PATCH] feat(product-process): 新增工序编号字段并优化编号生成逻辑

---
 src/main/java/com/ruoyi/production/pojo/ProductProcess.java |   25 ++++++++++++++++++++++---
 1 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
index e55ab4f..18fe087 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -25,16 +25,29 @@
     private Long id;
 
     /**
-     * 宸ュ簭鍚嶇О
+     * 璁惧鍙拌处id
      */
-    @Excel(name = "宸ュ簭鍚嶇О")
-    private String name;
+//    @Excel(name = "璁惧鍙拌处id")
+    private Long deviceLeaderId;
 
     /**
      * 宸ュ簭缂栧彿
      */
     @Excel(name = "宸ュ簭缂栧彿")
     private String no;
+
+    /**
+     * 宸ュ簭鍚嶇О
+     */
+    @Excel(name = "宸ュ簭鍚嶇О")
+    private String name;
+
+    @ApiModelProperty(value ="宸ュ簭鏈哄彴")
+    @TableField(value = "device_name")
+    @Excel(name = "宸ュ簭鏈哄彴")
+    private String deviceName;
+
+
 
     /**
      * 澶囨敞
@@ -51,6 +64,7 @@
     private BigDecimal salaryQuota;
 
     @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+    @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
     private Long type;
 
     /**
@@ -76,7 +90,12 @@
     private Long tenantId;
 
     @ApiModelProperty(value ="鏄惁璐ㄦ")
+    @Excel(name = "鏄惁璐ㄦ")
     private Boolean isQuality;
 
 
+
+    @ApiModelProperty(value ="璁惧id")
+    @TableField(value = "device_id")
+    private Long deviceId;
 }

--
Gitblit v1.9.3