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/pojo/SalesQuotation.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
index 72c4f00..f57293d 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesQuotation.java
@@ -2,10 +2,12 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -15,19 +17,24 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty(value = "鎶ヤ环鍗曠紪鍙�")
+ @Excel(name = "鎶ヤ环鍗曠紪鍙�")
private String quotationNo;
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customer;
@ApiModelProperty(value = "涓氬姟鍛�")
+ @Excel(name = "涓氬姟鍛�")
private String salesperson;
@ApiModelProperty(value = "鎶ヤ环鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鎶ヤ环鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate quotationDate;
@ApiModelProperty(value = "鏈夋晥鏈熻嚦")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鏈夋晥鏈熻嚦", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate validDate;
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
@@ -36,7 +43,8 @@
@ApiModelProperty(value = "鐘舵��")
private String status;
@ApiModelProperty(value = "鎶ヤ环鎬婚噾棰�")
- private Double totalAmount;
+ @Excel(name = "鎶ヤ环閲戦")
+ private BigDecimal totalAmount;
@ApiModelProperty(value = "澶囨敞")
private String remark;
--
Gitblit v1.9.3