From e0cfecb2b11b3d6ac91394e71c689a30356ead28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:29:28 +0800
Subject: [PATCH] fix:1.生产按照特定工序更改 2.库存按照型号,工序类别，电压进行筛选 3.销售页面展示电压，类别 4.生产入库按照电压入库
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 27ea5f8..40de24a 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -17,21 +17,17 @@
private String unit;
private String materialCode;
private String productModelName;
-
- //鍏ュ簱绫诲瀷
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;
@@ -39,16 +35,13 @@
private BigDecimal totalStockIn;
private BigDecimal totalStockOut;
private BigDecimal currentStock;
-
- private BigDecimal unLockedQuantity;
-
- //浜у搧id
+ private BigDecimal unLockedQuantity;
private Long productId;
- @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+ @Schema(description = "椤剁骇鐖剁骇浜у搧ID")
private Long topParentProductId;
- @Schema(description = "搴撳瓨绫诲瀷锛歲ualified(鍚堟牸)銆乽nqualified(涓嶅悎鏍�)")
+ @Schema(description = "搴撳瓨绫诲瀷")
private String stockType;
@Schema(description = "鍚堟牸搴撳瓨鏁伴噺")
@@ -57,16 +50,16 @@
@Schema(description = "涓嶅悎鏍煎簱瀛樻暟閲�")
private BigDecimal unQualifiedQuantity;
- @Schema(description = "鍚堟牸搴撳瓨鍐荤粨鏁伴噺")
+ @Schema(description = "鍚堟牸鍐荤粨鏁伴噺")
private BigDecimal qualifiedLockedQuantity;
- @Schema(description = "涓嶅悎鏍煎簱瀛樺喕缁撴暟閲�")
+ @Schema(description = "涓嶅悎鏍煎喕缁撴暟閲�")
private BigDecimal unQualifiedLockedQuantity;
- @Schema(description = "鍚堟牸搴撳瓨鏈喕缁撴暟閲�")
+ @Schema(description = "鍚堟牸鍙敤鏁伴噺")
private BigDecimal qualifiedUnLockedQuantity;
- @Schema(description = "涓嶅悎鏍煎簱瀛樻湭鍐荤粨鏁伴噺")
+ @Schema(description = "涓嶅悎鏍煎彲鐢ㄦ暟閲�")
private BigDecimal unQualifiedUnLockedQuantity;
@Schema(description = "鍚堟牸搴撳瓨ID")
@@ -75,9 +68,10 @@
@Schema(description = "涓嶅悎鏍煎簱瀛業D")
private Long unQualifiedId;
- @Schema(description = "鍚堟牸搴撳瓨鎵瑰彿")
+ @Schema(description = "鍚堟牸鎵规鍙�")
private String qualifiedBatchNo;
- @Schema(description = "涓嶅悎鏍煎簱瀛樻壒鍙�")
+ @Schema(description = "涓嶅悎鏍兼壒娆″彿")
private String unQualifiedBatchNo;
-}
\ No newline at end of file
+
+}
--
Gitblit v1.9.3