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/dto/StockUninventoryDto.java |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
index 404c58a..cff31ed 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
@@ -1,15 +1,56 @@
 package com.ruoyi.stock.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.stock.pojo.StockUninventory;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class StockUninventoryDto  extends StockUninventory {
     private String productName;
     private String model;
     private String unit;
+    private Long oilDepotId;
+    private String oilDepotName;
+    private String inboundCategory;
+    private Long tankId;
+    private String tankNo;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime inboundTime;
+    private String oilProduct;
+    private BigDecimal originalQuantity;
+    private Long customerId;
+    private String customerName;
+    private String contactPerson;
+    private String contactPhone;
+
+    //鐗╂祦淇℃伅
+    private String driverName;
+    private String driverPhone;
+    private String escortName;
+    private String escortPhone;
+    private String truckPlateNo;
+    private String trailerPlateNo;
+
+    //鍗告补鎿嶄綔淇℃伅
+    private String tankInspectionStatus;
+    private String unloadingCranePosition;
+    private String density;
+    // 鍏ュ弬涓烘暟缁勶紝鍒楄〃杩斿洖涓篔SON瀛楃涓�
+    private Object unloadPhotos;
+
+    //杩囩鏁版嵁
+    private BigDecimal grossWeight;
+    private BigDecimal tareWeight;
+    private BigDecimal netWeight;
+    private BigDecimal lossQuantity;
+    private BigDecimal actualVolume;
+    // 鍏ュ弬涓烘暟缁勶紝鍒楄〃杩斿洖涓篔SON瀛楃涓�
+    private Object poundPhotos;
 
 
     //鍏ュ簱绫诲瀷

--
Gitblit v1.9.3