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/dto/ReceiptPaymentDto.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 9462b98..1afb02c 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -1,19 +1,97 @@
package com.ruoyi.sales.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.ReceiptPayment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
@Data
public class ReceiptPaymentDto extends ReceiptPayment {
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
+ @ApiModelProperty(value = "鐘舵��")
+ @Excel(name = "鐘舵��")
+ private String statusName;
+
+
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�绁ㄦ棩鏈�",width = 30,dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�绁ㄦ棩鏈�")
+ private Date invoiceDate;
+
+ @TableField(exist = false)
+ private String invoiceDateStart;
+ @TableField(exist = false)
+ private String invoiceDateEnd;
@ApiModelProperty(value = "鏌ヨ鏂囨湰")
private String searchText;
+ @ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
+ @Excel(isExport = false)
+ private Long salesLedgerId;
+
+ @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Excel(name = "閿�鍞悎鍚屽彿")
+ private String salesContractNo;
+
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇ОID")
+ @Excel(isExport = false)
+ private Integer customerId;
+
+ @ApiModelProperty(value = "鍙戠エ鍙�")
+ @Excel(name = "鍙戠エ鍙�")
+ private String invoiceNo;
+
+ @ApiModelProperty(value = "鍙戠エ閲戦")
+ @Excel(name = "鍙戠エ閲戦")
+ private BigDecimal invoiceTotal;
+
+ @ApiModelProperty(value = "绋庣巼锛�%锛�")
+ @Excel(name = "绋庣巼锛�%锛�")
+ private BigDecimal taxRate;
+
+ @ApiModelProperty(value = "浜у搧澶х被")
+ @Excel(name = "浜у搧澶х被")
+ private String productCategory;
+
+ @ApiModelProperty(value = "鍥炴閲戦")
+ @Excel(name = "鍥炴閲戦")
+ private BigDecimal receiptPaymentAmountTotal;
+
+ @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Excel(name = "寰呭洖娆鹃噾棰�")
+ private BigDecimal noReceiptAmount;
+
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private Boolean status;
+
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private String receiptPaymentDateStart;
+ @TableField(exist = false)
+ @Excel(isExport = false)
+ private String receiptPaymentDateEnd;
+
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
+
+
}
--
Gitblit v1.9.3