From 1d915922d8197aa5d5dc3e40e3088d983dd6e141 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/consumables/dto/ConsumablesInventoryDto.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/dto/ConsumablesInventoryDto.java b/src/main/java/com/ruoyi/consumables/dto/ConsumablesInventoryDto.java
new file mode 100644
index 0000000..9625664
--- /dev/null
+++ b/src/main/java/com/ruoyi/consumables/dto/ConsumablesInventoryDto.java
@@ -0,0 +1,71 @@
+package com.ruoyi.consumables.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.consumables.pojo.ConsumablesInventory;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class ConsumablesInventoryDto extends ConsumablesInventory {
+
+ private String productName;
+ private String model;
+ private String unit;
+
+
+ //鍏ュ簱绫诲瀷
+ private String recordType;
+
+ //鍏ュ簱绫诲瀷瀵瑰簲鐨刬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 totalconsumablesIn;
+ private BigDecimal totalconsumablesOut;
+ private BigDecimal currentconsumables;
+
+ private BigDecimal unLockedQuantity;
+
+ private Long parentId;
+
+ @ApiModelProperty("杩囩鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime weighingDate;
+
+ private String parentName;
+
+ @ApiModelProperty("鍑�閲�(鎬绘暟)")
+ private BigDecimal netWeight;
+
+ @ApiModelProperty("杞︾墝鍙�")
+ private String licensePlateNo;
+
+ @ApiModelProperty("姣涢噸")
+ private BigDecimal grossWeight;
+
+ @ApiModelProperty("鐨噸")
+ private BigDecimal tareWeight;
+
+ @ApiModelProperty("杩囩鍛�")
+ private String weighingOperator;
+
+ @ApiModelProperty("纾呭崟鏂囦欢璺緞")
+ private String weighbridgeDocPath;
+}
--
Gitblit v1.9.3