From bee57301e2868fb64c998504794d17bb26bd71d2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 17 三月 2026 16:58:18 +0800
Subject: [PATCH] yys 1.需要加上库位,库位暂时分为外购、自制、委外三种类型 2.生产订单加上库存数量,方便实时查看 3.发货订单增加撤销功能

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

diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 5e7496a..95669da 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -5,6 +5,9 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 @Data
 @TableName("product_model")
 public class ProductModel {
@@ -30,7 +33,7 @@
     /**
      * 瑙勬牸鍨嬪彿
      */
-    @Excel(name = "瑙勬牸鍨嬪彿")
+    @Excel(name = "鍥剧焊缂栧彿")
     private String model;
 
     /**
@@ -48,4 +51,23 @@
     @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