From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位,审核

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

diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
index 88034cb..30f366e 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRoute.java
@@ -3,23 +3,34 @@
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @TableName("process_route")
 @Data
+@ApiModel(value = "processRoute", description = "宸ヨ壓璺嚎涓昏〃")
 public class ProcessRoute {
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "宸ヨ壓璺嚎鏄庣粏")
+    private List<ProcessRouteItem> processRouteItems;
 
     @ApiModelProperty(value = "搴忓彿")
     private Long id;
 
     @ApiModelProperty(value = "浜у搧ID")
+    //product_model
     private Long productModelId;
 
     @ApiModelProperty(value = "鎻忚堪")
     private String description;
+
+    @ApiModelProperty(value = "鍒涘缓浜�")
+    private String createBy;
 
     @ApiModelProperty(value = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
@@ -30,9 +41,15 @@
     private LocalDateTime createTime;
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "宸ヨ壓璺嚎缂栫爜")
     private String processRouteCode;
+
+    @ApiModelProperty(value = "宸ヨ壓璺嚎鍚嶇О")
+    private String processRouteName;
+
+    @ApiModelProperty(value = "BOM鐨処D")
+    private Integer bomId;
 }

--
Gitblit v1.9.3