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/TicketRegistration.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
index 41d6171..e79796a 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/TicketRegistration.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -25,6 +26,13 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+
+ /**
+ * 鐘舵��
+ */
+ @Excel(name = "鐘舵��")
+ @TableField(exist = false)
+ private String statusName;
/**
* 閲囪喘鍙拌处id
@@ -78,6 +86,12 @@
private BigDecimal invoiceAmount;
/**
+ * 寮�绁ㄤ汉ID
+ */
+ @Excel(name = "寮�绁ㄤ汉")
+ private String issUerId;
+
+ /**
* 寮�绁ㄤ汉
*/
@Excel(name = "寮�绁ㄤ汉")
@@ -126,4 +140,27 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @ApiModelProperty(value = "宸蹭粯娆炬�婚噾棰�")
+ @TableField(exist = false)
+ @Excel(name = "宸蹭粯娆炬�婚噾棰�")
+ private BigDecimal paymentAmountTotal;
+
+ @ApiModelProperty(value = "鏈粯娆炬�婚噾棰�")
+ @TableField(exist = false)
+ @Excel(name = "鏈粯娆炬�婚噾棰�")
+ private BigDecimal unPaymentAmountTotal;
+
+ @TableField(exist = false)
+ private Boolean status;
+
+ @TableField(exist = false)
+ private String issueDateStart;
+ @TableField(exist = false)
+ private String issueDateEnd;
+
+ @TableField(exist = false)
+ private String supplierNameOrContractNo;
+
+ @ApiModelProperty(value = "褰曞叆鏃堕棿")
+ private LocalDate enterDate;
}
--
Gitblit v1.9.3