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/StockInRecord.java | 127 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 112 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
index a20724a..905e702 100644
--- a/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
+++ b/src/main/java/com/ruoyi/stock/pojo/StockInRecord.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.enums.ReviewStatusEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -12,7 +12,7 @@
@Data
@TableName("stock_in_record")
-@ApiModel("鍏ュ簱绠＄悊")
+@Schema(name = "鍏ュ簱绠＄悊")
public class StockInRecord {
private static final long serialVersionUID = 1L;
@@ -22,44 +22,141 @@
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鍏ュ簱鎵规")
+ @Schema(description = "鍏ュ簱鎵规")
private String inboundBatches;
- @ApiModelProperty(value = "鍏ュ簱鏁伴噺")
+ @Schema(description = "鍏ュ簱鏁伴噺")
private BigDecimal stockInNum;
- @ApiModelProperty(value = "璁板綍绫诲瀷 閲囪喘鍏ュ簱/鐢熶骇鍏ュ簱/璐ㄩ噺鍏ュ簱/鑷畾涔夊叆搴�")
+ @Schema(description = "鎵瑰彿")
+ private String batchNo;
+
+ @Schema(description = "璁板綍绫诲瀷 鏋氫妇")
private String recordType;
- @ApiModelProperty(value = "璁板綍ID salesProductId/ProductrMainId/qualityInspectId/0")
+ @Schema(description = "璁板綍ID ")
private Long recordId;
- @ApiModelProperty(value = "浜у搧瑙勬牸ID")
+ @Schema(description = "浜у搧瑙勬牸ID")
private Long productModelId;
- @ApiModelProperty(value = "澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
+ @Schema(description = "棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
+ @Schema(description = "鍏ュ簱娌瑰簱id")
+ private Long oilDepotId;
+
+ @Schema(description = "鍏ュ簱鍚嶇О锛堟补搴撳悕绉帮級")
+ private String oilDepotName;
+
+ @Schema(description = "鍏ュ簱绫诲埆锛氳嚜璐叆搴�/浠ｅ偍鍏ュ簱")
+ private String inboundCategory;
+
+ @Schema(description = "鍌ㄧ綈id")
+ private Long tankId;
+
+ @Schema(description = "鍌ㄧ綈鍙�")
+ private String tankNo;
+
+ @Schema(description = "鍏ュ簱鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime inboundTime;
+
+ @Schema(description = "娌瑰搧锛氭苯#92銆佹苯#95銆佹煷#0銆佹煷#-35")
+ private String oilProduct;
+
+ @Schema(description = "鍘熷巶鏁伴噺(鍚�)")
+ private BigDecimal originalQuantity;
+
+ @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 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 = "杞︿綋/閾呭皝妫�楠屾槸鍚︽甯革細姝ｅ父/寮傚父")
+ private String tankInspectionStatus;
+
+ @Schema(description = "鍗歌溅楣や綅锛�1#鎾/2#鎾/涓存椂娉�")
+ private String unloadingCranePosition;
+
+ @Schema(description = "瀵嗗害锛坘g/L锛�")
+ private String density;
+
+ @Schema(description = "鍗告补鍏抽敭鐜妭涓庤溅杈嗗叧閿綅缃媿鐓э紙JSON鏁扮粍锛�")
+ private String unloadPhotos;
+
+ @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 = "绫诲瀷 0鍚堟牸鍏ュ簱 1涓嶅悎鏍煎叆搴�")
private String type;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
+ @Schema(description = "鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
+
+ @Schema(description = "瀹℃壒鐘舵�� 0-寰呭鎵� 1-閫氳繃 2-椹冲洖", implementation = ReviewStatusEnum.class)
+ private Integer approvalStatus;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3