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/SalesLedgerProduct.java | 78 +++++++++++++++++++++++++++++++++------
1 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index f35b916..67219f7 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -49,6 +49,13 @@
private String productCategory;
/**
+ * 鐗╂枡缂栧彿
+ */
+ @Excel(name = "鐗╂枡缂栧彿")
+ @TableField(exist = false)
+ private String materialCode;
+
+ /**
* 瑙勬牸鍨嬪彿
*/
@Excel(name = "瑙勬牸鍨嬪彿")
@@ -71,8 +78,13 @@
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
+
+ /**
+ * 鏈�浣庡簱瀛樻暟閲�
+ */
@Excel(name = "鏈�浣庡簱瀛樻暟閲�")
private BigDecimal minStock;
+
/**
* 绋庣巼
*/
@@ -111,34 +123,34 @@
/**
* 鏈鏉ョエ鏁�
*/
- private BigDecimal ticketsNum;
+ private BigDecimal ticketsNum=BigDecimal.ZERO;
/**
* 鏈鏉ョエ閲戦(鍏�)
*/
- private BigDecimal ticketsAmount;
+ private BigDecimal ticketsAmount=BigDecimal.ZERO;
/**
* 鏈潵绁ㄦ暟
*/
- private BigDecimal futureTickets;
+ private BigDecimal futureTickets=BigDecimal.ZERO;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
*/
- private BigDecimal futureTicketsAmount;
+ private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
@ApiModelProperty(value = "寮�绁ㄦ暟")
- private BigDecimal invoiceNum;
+ private BigDecimal invoiceNum = BigDecimal.ZERO;
@ApiModelProperty(value = "鏈紑绁ㄦ暟")
- private BigDecimal noInvoiceNum;
+ private BigDecimal noInvoiceNum = BigDecimal.ZERO;
@ApiModelProperty(value = "寮�绁ㄩ噾棰�")
- private BigDecimal invoiceAmount;
+ private BigDecimal invoiceAmount = BigDecimal.ZERO;
@ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
- private BigDecimal noInvoiceAmount;
+ private BigDecimal noInvoiceAmount = BigDecimal.ZERO;
@ApiModelProperty(value = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
@@ -192,6 +204,14 @@
@TableField(exist = false)
private String shippingCarNumber;
+ @ApiModelProperty("蹇�掑叕鍙�")
+ @TableField(exist = false)
+ private String expressCompany;
+
+ @ApiModelProperty("蹇�掑崟鍙�")
+ @TableField(exist = false)
+ private String expressNumber;
+
/**
* 鍙戣揣鏃ユ湡
*/
@@ -201,12 +221,46 @@
private Date shippingDate;
@TableField(exist = false)
- @ApiModelProperty(value = "鐢熶骇鐘舵��")
- private String productionStatus = "鏈紑濮�";
+ @ApiModelProperty(value = "鍙戣揣鐘舵��")
+ private String shippingStatus = "寰呭彂璐�";
/**
- * 鍙戣揣瀹℃壒鐘舵��
+ * 浜у搧鐘舵��
*/
// @TableField(exist = false)
- @ApiModelProperty(value = "瀹℃壒鐘舵��")
+ @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
+
+ @ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
+ private BigDecimal pendingInvoiceTotal;
+
+ @ApiModelProperty(value = "鍥炴鎬婚噾棰�")
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
+ private BigDecimal pendingTicketsTotal;
+
+ @ApiModelProperty(value = "浠樻鎬婚噾棰�")
+ private BigDecimal ticketsTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "鏄惁璐ㄦ")
+ private Boolean isChecked;
+
+ @TableField(exist = false)
+ private Integer hasSufficientStock;
+
+ @ApiModelProperty("搴忓彿")
+ @TableField(exist = false)
+ @Excel(name = "搴忓彿")
+ private Integer serialNumber;
+
+ @ApiModelProperty("璁㈠崟鍙�")
+ @Excel(name = "璁㈠崟鍙�")
+ @TableField(exist = false)
+ private String orderNo;
+
+ @ApiModelProperty("鎵瑰彿")
+ private String batchNo;
+
+ @ApiModelProperty("搴撳瓨id")
+ private Long stockId;
}
--
Gitblit v1.9.3