From d8c86797adaef6c416efae16586f350ae77bde4b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 12 九月 2026 12:43:08 +0800
Subject: [PATCH] feat: 库存入库/出库字段全链路、采购台账申请提交时间、储罐租客信息、油库储罐模块

---
 src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java |   88 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
index 20ea4a2..2379658 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockOutRecord.java
@@ -10,6 +10,7 @@
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -46,6 +47,90 @@
     @Schema(description = "鍏ュ簱绫诲瀷")
     private String recordType;
 
+    @Schema(description = "鍑哄簱绫诲埆锛氬瀛�/浠ｅ偍/閿�鍞�")
+    private String outCategory;
+
+    @Schema(description = "鍌ㄥ簱id")
+    private Long oilDepotId;
+
+    @Schema(description = "鍌ㄥ簱鍚嶇О")
+    private String oilDepotName;
+
+    @Schema(description = "鍌ㄧ綈id")
+    private Long tankId;
+
+    @Schema(description = "鍌ㄧ綈鍙�")
+    private String tankNo;
+
+    @Schema(description = "鍑哄簱鏃ユ湡")
+    private LocalDate outDate;
+
+    @Schema(description = "娌瑰搧")
+    private String oilProduct;
+
+    @Schema(description = "鍑哄簱鍚ㄤ綅(鍚�)")
+    private BigDecimal outTonnage;
+
+    @Schema(description = "瀹㈡埛id")
+    private Long customerId;
+
+    @Schema(description = "瀹㈡埛鍚嶇О")
+    private String customerName;
+
+    @Schema(description = "瀹㈡埛瀵规帴浜�")
+    private String contactPerson;
+
+    @Schema(description = "瀵规帴浜虹數璇�")
+    private String contactPhone;
+
+    @Schema(description = "杞︿綋/閾呭皝妫�楠屾槸鍚︽甯�")
+    private String loadingInspectionStatus;
+
+    @Schema(description = "瑁呰溅楣や綅")
+    private String loadingCranePosition;
+
+    @Schema(description = "瑁呮补鍏抽敭鐜妭涓庤溅杈嗗叧閿綅缃媿鐓э紙JSON鏁扮粍锛�")
+    private String loadingPhotos;
+
+    @Schema(description = "瀵嗗害锛坘g/L锛�")
+    private String density;
+
+    @Schema(description = "姣涢噸(鍚�)")
+    private BigDecimal grossWeight;
+
+    @Schema(description = "鐨噸(鍚�)")
+    private BigDecimal tareWeight;
+
+    @Schema(description = "鍑�閲�(鍚�)")
+    private BigDecimal netWeight;
+
+    @Schema(description = "浜忛噺(鍚�)")
+    private BigDecimal lossQuantity;
+
+    @Schema(description = "瀹為檯鍏ュ簱浣撶Н(鍗�)")
+    private BigDecimal actualVolume;
+
+    @Schema(description = "纾呭崟涓婁紶锛圝SON鏁扮粍锛�")
+    private String poundPhotos;
+
+    @Schema(description = "鍙告満濮撳悕")
+    private String driverName;
+
+    @Schema(description = "鍙告満鐢佃瘽")
+    private String driverPhone;
+
+    @Schema(description = "鎶艰繍鍛樺鍚�")
+    private String escortName;
+
+    @Schema(description = "鎶艰繍鍛樼數璇�")
+    private String escortPhone;
+
+    @Schema(description = "杞︾墝鍙�")
+    private String truckPlateNo;
+
+    @Schema(description = "杞︽寕鐗屽彿")
+    private String trailerPlateNo;
+
     @Schema(description = "浜у搧瑙勬牸id")
     private Long productModelId;
 
@@ -53,7 +138,6 @@
     private String remark;
 
     @Schema(description = "鍒涘缓鏃堕棿")
-    @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
@@ -75,7 +159,7 @@
     @Schema(description = "绫诲瀷  0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
     private String type;
 
-    @Schema(description = "瀹℃壒鐘舵��  0-寰呭鎵� 1-閫氳繃 2-椹冲洖", implementation = ReviewStatusEnum.class)
+    @Schema(description = "瀹℃壒鐘舵��  0-寰呭鎵� 1-閫氳繃 2-椹冲洖 3-閿�鍞嚭搴撳緟纭", implementation = ReviewStatusEnum.class)
     private Integer approvalStatus;
 
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.9.3