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/sales/vo/ShippingNoteVo.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java b/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
index fc22574..c5166f9 100644
--- a/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
+++ b/src/main/java/com/ruoyi/sales/vo/ShippingNoteVo.java
@@ -4,6 +4,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -30,6 +31,32 @@
private String deliveryDate;
@Excel(name = "浜у搧淇℃伅", type = Excel.Type.EXPORT)
- private List<SalesLedgerProduct> products;
+ private List<SalesLedgerProductVo> products;
+ @Excel(name = "鍚堣鏁伴噺", cellType = Excel.ColumnType.NUMERIC)
+ private BigDecimal totalQuantity;
+
+ @Data
+ public static class SalesLedgerProductVo {
+ @Excel(name = "搴忓彿", cellType = Excel.ColumnType.NUMERIC)
+ private Integer serialNumber;
+
+ @Excel(name = "鐗╂枡缂栧彿", cellType = Excel.ColumnType.STRING)
+ private String materialCode;
+
+ @Excel(name = "浜у搧绫诲埆", cellType = Excel.ColumnType.STRING)
+ private String productCategory;
+
+ @Excel(name = "瑙勬牸鍨嬪彿", cellType = Excel.ColumnType.STRING)
+ private String specificationModel;
+
+ @Excel(name = "鍗曚綅", cellType = Excel.ColumnType.STRING)
+ private String unit;
+
+ @Excel(name = "鏁伴噺", cellType = Excel.ColumnType.NUMERIC)
+ private BigDecimal quantity;
+
+ @Excel(name = "璁㈠崟鍙�", cellType = Excel.ColumnType.STRING)
+ private String orderNo;
+ }
}
--
Gitblit v1.9.3