From 651783a736442ce674761b84603d6ec720f098b0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 07 四月 2026 13:14:43 +0800
Subject: [PATCH] 工序模版导入缺少工序类型字段,可提供选择计时或计件

---
 src/main/java/com/ruoyi/production/pojo/ProductProcess.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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..3029ea5 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;
@@ -44,7 +47,16 @@
      * 宸ヨ祫瀹氶
      */
     @Excel(name = "宸ヨ祫瀹氶")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal salaryQuota;
+
+    @ApiModelProperty("绫诲瀷 鍖哄垎鏄鏃惰繕鏄浠� 0 璁℃椂 1璁′欢")
+    private Long type;
+
+    @ApiModelProperty(value = "宸ュ簭绫诲瀷")
+    @Excel(name = "宸ュ簭绫诲瀷")
+    @TableField(exist = false)
+    private String typeText;
 
     /**
      * 鍒涘缓鏃堕棿
@@ -68,5 +80,10 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    @ApiModelProperty(value ="鏄惁璐ㄦ")
+    private Boolean isQuality;
+
+    @ApiModelProperty(value = "缁戝畾鐨勮澶嘔D鍒楄〃(JSON鏍煎紡)")
+    private String deviceIds;
 
 }

--
Gitblit v1.9.3