From 5c891d8d2c206dfd2aa6daf59579eb2b6843dcc0 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 18:00:37 +0800
Subject: [PATCH] fix:1.采购/销售入库去掉审批 2.返工下载附件内容变更 3.生产/库存入库生产日期添加 4.仓库导入导出字段优化
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 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..183f4d5 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -1,13 +1,21 @@
package com.ruoyi.stock.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@EqualsAndHashCode(callSuper = true)
@Data
public class StockInventoryDto extends StockInventory {
private String productName;
private String model;
+ private String uidNo;
private String unit;
@@ -16,4 +24,26 @@
//鍏ュ簱绫诲瀷瀵瑰簲鐨刬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;
+ private Long productId; // 浜у搧ID
+ private Long parentId; // 鐖剁骇浜у搧ID
+ private Long productModelId; // 浜у搧鍨嬪彿ID
+ private String productScope; //浜у搧绫诲瀷
}
--
Gitblit v1.9.3