From 92d8d06d8ae38c407715a5e9389691b446413e0a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 27 三月 2026 10:06:09 +0800
Subject: [PATCH] yys 1.生产逻辑修改

---
 src/main/java/com/ruoyi/basic/pojo/ProductModel.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 4d336b7..8b88d82 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -1,9 +1,12 @@
 package com.ruoyi.basic.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 @TableName("product_model")
@@ -17,13 +20,57 @@
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "宸ヨ壓璺嚎id")
+    private Long routeId;
+
     /**
      * 鍏宠仈浜у搧id
      */
+    @Excel(name = "鍏宠仈浜у搧id")
     private Long productId;
+
+    @TableField(exist = false)
+    @Excel(name = "浜у搧鍚嶇О")
+    private String productName;
 
     /**
      * 瑙勬牸鍨嬪彿
      */
+    @Excel(name = "鍥剧焊缂栧彿")
     private String model;
+
+    /**
+     * 鍗曚綅
+     */
+    @Excel(name = "鍗曚綅")
+    private String unit;
+
+    /**
+     * 鐢熶骇鐐掓満
+     */
+    @Excel(name = "鐢熶骇鐐掓満")
+    private String speculativeTradingName;
+
+    @ApiModelProperty(value = "绉熸埛ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Long tenantId;
+    @TableField(exist = false)
+    @Excel(name = "鍏ュ簱鏁伴噺")
+    private BigDecimal inboundNum;
+    @TableField(exist = false)
+    @Excel(name = "鍑哄簱鏁伴噺")
+    private BigDecimal outboundNum;
+    @TableField(exist = false)
+    @Excel(name = "鍓╀綑搴撳瓨")
+    private BigDecimal stockQuantity;
+
+    @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+    @Excel(name = "瑙勬牸鍨嬪彿")
+    private String drawingNumber;
+
+    @TableField(exist = false)
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "浜у搧绫诲瀷(1-鐗╂枡,2-浜у搧)")
+    private Integer productType;
 }

--
Gitblit v1.9.3