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/purchase/pojo/PaymentRegistration.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
index d117038..803d600 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PaymentRegistration.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
@@ -36,6 +37,11 @@
private Long purchaseLedgerId;
/**
+ * 閲囪喘璁㈠崟浜у搧id
+ */
+ private Long salesLedgerProductId;
+
+ /**
* 渚涘簲鍟唅d
*/
private Long supplierId;
@@ -48,11 +54,13 @@
/**
* 鏈浠樻閲戦
*/
+ @Excel(name = "浠樻閲戦")
private BigDecimal currentPaymentAmount;
/**
* 浠樻褰㈠紡
*/
+ @Excel(name = "浠樻褰㈠紡")
private String paymentMethod;
/**
@@ -66,18 +74,21 @@
private Long registrantId;
// 绉熸埛id
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 浠樻鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "浠樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date paymentDate;
/**
* 鐧昏鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date registrationtDate;
/**
--
Gitblit v1.9.3