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 | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 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 af7b343..18fe087 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductProcess.java
@@ -4,6 +4,8 @@
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;
@@ -14,6 +16,7 @@
@TableName("product_process")
@Data
@ExcelIgnoreUnannotated
+@ApiModel(value = "productProcess", description = "宸ュ簭琛�")
public class ProductProcess implements Serializable {
private static final long serialVersionUID = 1L;
@@ -22,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;
+
+
/**
* 澶囨敞
@@ -44,7 +60,12 @@
* 宸ヨ祫瀹氶
*/
@Excel(name = "宸ヨ祫瀹氶")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salaryQuota;
+
+ @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+ @Excel(name = "绫诲瀷 0 璁℃椂 1璁′欢")
+ private Long type;
/**
* 鍒涘缓鏃堕棿
@@ -68,5 +89,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