From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
index c93e934..c638ebb 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -1,11 +1,14 @@
package com.ruoyi.sales.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.vo.FileVo;
import com.ruoyi.sales.pojo.InvoiceLedger;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
import java.util.List;
@Data
@@ -19,6 +22,9 @@
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
private String customerName;
+ @ApiModelProperty(value = "瀹㈡埛ID")
+ private Integer customerId;
+
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
@@ -31,6 +37,10 @@
@ApiModelProperty(value = "鍥炴閲戦")
private BigDecimal receiptPaymentAmount;
+ @ApiModelProperty(value = "鍥炴鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date receiptPaymentDate;
+
@ApiModelProperty(value = "鏈洖娆鹃噾棰�")
private BigDecimal unReceiptPaymentAmount;
@@ -42,4 +52,6 @@
@ApiModelProperty(value = "閿�鍞悎鍚孖D")
private Integer salesLedgerId;
+
+ private String paymentMethod;
}
--
Gitblit v1.9.3