From cf6b1cf6fa8f7784c6d7c64b7326d4662bc3d4b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 14 十月 2025 17:39:06 +0800
Subject: [PATCH] yys 1.智能排产 2.物料看板 3.报表分析

---
 main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java |   88 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
index e97889f..b48dc03 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/OfficialInventory.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.MyBaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 
 /**
  * 姝ｅ紡搴撳瓨琛� 瀹炰綋绫�
@@ -18,68 +20,128 @@
  */
 @Data
 @TableName("official_inventory")
+@Schema
 public class OfficialInventory extends MyBaseEntity {
-
-    private static final long serialVersionUID = 1L;
 
     /**
      * 涓婚敭ID
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
+
+    /**
+     *
+     * 閲囪喘鍗曞彿
+     */
+    @TableField(value = "purchase_number")
+    @Schema(title = "閲囪喘鍗曞彿")
+    private String purchaseNumber;
     /**
      * 寰呭叆搴搃d
      */
     @TableField(value = "pending_id")
+    @Schema(title = "寰呭叆搴搃d")
     private Long pendingId;
     /**
-     * 渚涜揣鍟嗗悕绉�
+     * 渚涜揣鍟咺D
      */
-    @TableField(value = "supplier_name")
-    private String supplierName;
+    @TableField(value = "supplier_id")
+    @Schema(title = "渚涜揣鍟咺D")
+    private Long supplierId;
+    /**
+     * 缂栧彿
+     */
+    @TableField(value = "code")
+    private String code;
+
+    /**
+     * 鐓ゆ枡绫诲瀷 1-鎴愬搧 2-鍘熸枡
+     */
+    @TableField(value = "type")
+    @Schema(title = "鐓ゆ枡绫诲瀷 1-鎴愬搧 2-鍘熸枡")
+    private Integer type;
+
     /**
      * 鐓ょ
      */
-    @TableField(value = "coal")
-    private String coal;
+    @TableField(value = "coal_id")
+    @Schema(title = "鐓ょ")
+    private Long coalId;
+
+    /**
+     * 鐓ょ鍚嶇О
+     */
+    @TableField(exist = false)
+    @Schema(title = "鐓ょ鍚嶇О")
+    private String coalName;
     /**
      * 鍗曚綅
      */
     @TableField(value = "unit")
+    @Schema(title = "鍗曚綅")
     private String unit;
     /**
      * 搴撳瓨鏁伴噺
      */
     @TableField(value = "inventory_quantity")
+    @Schema(title = "搴撳瓨鏁伴噺")
     private BigDecimal inventoryQuantity;
     /**
      * 鍗曚环锛堝惈绋庯級
      */
     @TableField(value = "price_including_tax")
+    @Schema(title = "鍗曚环锛堝惈绋庯級")
     private BigDecimal priceIncludingTax;
     /**
      * 鎬讳环锛堝惈绋庯級
      */
     @TableField(value = "total_price_including_tax")
+    @Schema(title = "鎬讳环锛堝惈绋庯級")
     private BigDecimal totalPriceIncludingTax;
     /**
-     * 鎴愭湰鍗曚环
+     * 涓嶅惈绋庡崟浠�
      */
-    @TableField(value = "cost_per_unit")
-    private BigDecimal costPerUnit;
+    @TableField(value = "price_excluding_tax")
+    @Schema(title = "涓嶅惈绋庡崟浠�")
+    private BigDecimal priceExcludingTax;
+    /**
+     * 涓嶅惈绋庢�讳环
+     */
+    @TableField(value = "total_price_excluding_tax")
+    @Schema(title = "涓嶅惈绋庢�讳环")
+    private BigDecimal totalPriceExcludingTax;
     /**
      * 寰呰ˉ搴�
      */
     @TableField(value = "pending_replenishment")
+    @Schema(title = "寰呰ˉ搴�")
     private BigDecimal pendingReplenishment;
     /**
      * 鐧昏浜篿d
      */
     @TableField(value = "registrant_id")
-    private String registrantId;
+    @Schema(title = "鐧昏浜篿d")
+    private Long registrantId;
+
     /**
      * 鐧昏鏃ユ湡
      */
     @TableField(value = "registration_date")
-    private Date registrationDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Schema(title = "鐧昏鏃ユ湡")
+    private LocalDate registrationDate;
+
+    /**
+     * 鐓よ川鏂规id
+     */
+    @TableField(value = "coal_plan_id")
+    @Schema(title = "鐓よ川鏂规id")
+    private Long coalPlanId;
+
+    /**
+     * 鍚堝苟id
+     */
+    @TableField(value = "merge_id")
+    @Schema(title = "鍚堝苟id")
+    private String mergeId;
 }
\ No newline at end of file

--
Gitblit v1.9.3