From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 5d31d88..ee9e07b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -11,6 +11,9 @@
@Data
public class ProductWorkOrderDto extends ProductWorkOrder {
+ @ApiModelProperty(value = "浜у搧ID")
+ private String productId;
+
//浜у搧鍚嶇О
@ApiModelProperty(value = "浜у搧鍚嶇О")
private String productName;
@@ -18,6 +21,10 @@
//瑙勬牸
@ApiModelProperty(value = "瑙勬牸")
private String model;
+
+ //鏂欏彿
+ @ApiModelProperty(value = "鏂欏彿")
+ private String materialCode;
//宸ュ簭
@ApiModelProperty(value = "宸ュ簭")
@@ -40,8 +47,24 @@
@ApiModelProperty(value = "瀹屾垚杩涘害")
private BigDecimal completionStatus;
+ // 鎬讳骇鍑烘暟閲�
+ @ApiModelProperty(value = "鎬讳骇鍑烘暟閲忥紙鍖呭惈鎶ュ簾鏁伴噺锛�")
+ private BigDecimal totalQty;
+
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+
+ // 涓嶈壇鏁伴噺
+ @ApiModelProperty(value = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity;
+
+ // 鎶曞叆鏁伴噺
+ @ApiModelProperty(value = "鎶曞叆鏁伴噺")
+ private BigDecimal inputQty;
+
+ // 浜у搧缁撴瀯鎶曞叆鏁伴噺
+ @ApiModelProperty(value = "浜у搧缁撴瀯鎶曞叆鏁伴噺")
+ private BigDecimal bomInputQty;
@ApiModelProperty(value = "宸ュ崟绫诲瀷 姝ｅ父 /杩斿伐杩斾慨")
private String workOrderType;
@@ -60,7 +83,7 @@
private BigDecimal completeQty;
@ApiModelProperty(value = "涓嶈壇鐜�")
- private BigDecimal scrapRate;
+ private BigDecimal defectiveRate;
@ApiModelProperty(value = "鐘舵�佹枃鏈�")
private String statusText;
--
Gitblit v1.9.3