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/StockInventoryDto.java | 131 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 131 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 709facf..32a95aa 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -1,7 +1,14 @@
package com.ruoyi.stock.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
@Data
public class StockInventoryDto extends StockInventory {
@@ -9,6 +16,45 @@
private String productName;
private String model;
private String unit;
+ private String batchNo;
+ 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;
//鍏ュ簱绫诲瀷
@@ -16,4 +62,89 @@
//鍏ュ簱绫诲瀷瀵瑰簲鐨刬d
private Long recordId;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate reportDate;
+
+ //搴撳瓨鏈堟姤鏌ヨ瀛楁
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate startMonth;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate endMonth;
+
+ private BigDecimal totalStockIn;
+ private BigDecimal totalStockOut;
+ private BigDecimal currentStock;
+
+ private BigDecimal unLockedQuantity;
+
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+ private Long topParentProductId;
+
+ @Schema(description = "搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
+ private String stockType;
+
+ @Schema(description = "鍚堟牸搴撳瓨鏁伴噺")
+ private BigDecimal qualifiedQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻暟閲�")
+ private BigDecimal unQualifiedQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
+ private BigDecimal qualifiedLockedQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
+ private BigDecimal unQualifiedLockedQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
+ private BigDecimal qualifiedUnLockedQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
+ private BigDecimal unQualifiedUnLockedQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨寰呭鏍稿嚭搴撴暟閲忥紙涓嶅崰鐢ㄥ簱瀛樹絾宸茬敵璇峰嚭搴擄級")
+ private BigDecimal qualifiedPendingOutQuantity;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛樺緟瀹℃牳鍑哄簱鏁伴噺")
+ private BigDecimal unQualifiedPendingOutQuantity;
+
+ @Schema(description = "鍚堟牸搴撳瓨ID")
+ private Long qualifiedId;
+
+ @Schema(description = "涓嶅悎鏍煎簱瀛業D")
+ private Long unQualifiedId;
+
+ @Schema(description = "浜у搧id")
+ private Long productId;
+
+ //娌瑰搧鍑哄簱璁板綍灞曠ず瀛楁锛堣鎯呮帴鍙ｆ寜浜у搧鍏宠仈鏈�鏂板嚭搴撹褰曪級
+ private String outCategory;
+ private LocalDate outDate;
+ private BigDecimal outTonnage;
+ private String outCustomerName;
+ private String loadingInspectionStatus;
+ private String loadingCranePosition;
+ private String outDensity;
+ private String outDriverName;
+ private String outTruckPlateNo;
+ private String outOilDepotName;
+ private String outTankNo;
+ private String outOilProduct;
+ private String outContactPerson;
+ private String outContactPhone;
+ private BigDecimal outGrossWeight;
+ private BigDecimal outTareWeight;
+ private BigDecimal outNetWeight;
+ private BigDecimal outLossQuantity;
+ private BigDecimal outActualVolume;
+ private String outDriverPhone;
+ private String outEscortName;
+ private String outEscortPhone;
+ private String outTrailerPlateNo;
+ // 鍒楄〃杩斿洖涓篔SON瀛楃涓�
+ private Object loadingPhotos;
+ private Object outPoundPhotos;
}
--
Gitblit v1.9.3