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/SalesLedgerWorkDto.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
index bf9e9d5..3e982e7 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.dto;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -27,6 +28,7 @@
* 鎺掍骇浜哄悕绉�
*/
@ApiModelProperty(value = "鎺掍骇浜哄悕绉�")
+ @Excel(name = "鎺掍骇浜�")
private String schedulingUserName;
@@ -34,13 +36,22 @@
* 鎺掍骇鏁伴噺
*/
@ApiModelProperty(value = "鎺掍骇鏁伴噺")
+ @Excel(name = "鎺掍骇鏁伴噺")
private BigDecimal schedulingNum;
/**
* 鐢熶骇鏁伴噺
*/
@ApiModelProperty(value = "鐢熶骇鏁伴噺")
+ @Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal finishedNum;
+
+ /**
+ * 寰呯敓浜ф暟閲�
+ */
+ @ApiModelProperty(value = "寰呯敓浜ф暟閲�")
+ @Excel(name = "寰呯敓浜ф暟閲�")
+ private BigDecimal daiNum;
/**
* 宸ユ椂瀹氶
@@ -52,17 +63,27 @@
* 宸ュ簭
*/
@ApiModelProperty(value = "宸ュ簭")
+ @Excel(name = "宸ュ簭")
private String process;
+
+
+ /**
+ * 浜х嚎
+ */
+ @ApiModelProperty(value = "浜х嚎")
+ @Excel(name = "浜х嚎")
+ private String productionLine;
/**
* 鎺掍骇鏃ユ湡
*/
@ApiModelProperty(value = "鎺掍骇鏃ユ湡")
+ @Excel(name = "鎺掍骇鏃ユ湡")
private String schedulingDate;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private String schedulingDateStart;
+ private String entryDateStart;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private String schedulingDateEnd;
+ private String entryDateEnd;
/**
* 鎶ュ伐鐘舵�侊紙1-寰呯敓浜� 2-宸叉姤宸ワ級
@@ -70,4 +91,43 @@
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
+ @Excel(name = "鐘舵��", readConverterExp = "1=寰呯敓浜�,2=鐢熶骇涓�,3=宸叉姤宸�")
+ private String statusName;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ @Excel(name = "澶囨敞")
+ private String remark;
+
+ /**
+ * 鎹熻��
+ */
+ @ApiModelProperty(value = "鎹熻��")
+ @Excel(name = "鎹熻��")
+ private String loss;
+
+ /**
+ * 缁戝畾鏈哄櫒
+ */
+ @ApiModelProperty(value = "缁戝畾鏈哄櫒")
+ @Excel(name = "缁戝畾鏈哄櫒")
+ private String speculativeTradingName;
+
+ /**
+ * 鍙ｅ懗鍒嗙被
+ */
+ @ApiModelProperty(value = "鍙ｅ懗鍒嗙被")
+ @Excel(name = "鍙ｅ懗鍒嗙被")
+ private String type;
+
+ /**
+ * 棰嗙敤
+ */
+ @ApiModelProperty(value = "棰嗙敤")
+ @Excel(name = "棰嗙敤")
+ private String receive;
+
+
}
--
Gitblit v1.9.3