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/SalesLedgerDto.java | 41 ++++++++++++++---------------------------
1 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 14377bc..e2d7955 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -3,34 +3,21 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.time.LocalDate;
-import java.util.Date;
import java.util.List;
@Data
-public class SalesLedgerDto {
-
- private Long id;
- private String salesContractNo;
- private String customerContractNo;
- private String projectName;
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date entryDate;
+@EqualsAndHashCode(callSuper = true)
+public class SalesLedgerDto extends SalesLedger {
private String entryDateStart;
private String entryDateEnd;
-
-
- private String salesman;
- private Long customerId;
- private String customerName;
- private String entryPerson;
- private String remarks;
- private String attachmentMaterials;
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -38,9 +25,9 @@
@TableField(exist = false)
private String invoiceNo;
+
@TableField(exist = false)
private String createUser;
-
private Boolean hasChildren = false;
private List<SalesLedgerProduct> productData;
@@ -48,17 +35,17 @@
private List<CommonFile> SalesLedgerFiles;
private Integer type;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
- private LocalDate executionDate;
-
private Boolean status;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
- private String paymentMethod;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
- @ApiModelProperty(value = "浜よ揣鏃ユ湡")
- private LocalDate deliveryDate;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢靛帇")
+ private String voltage;
- @ApiModelProperty(value = "鏄惁鐢熶骇")
- private boolean produce;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "c")
+ private String qty;
}
--
Gitblit v1.9.3