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/collaborativeApproval/pojo/MeetDraft.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
index 07adca4..7df4b0a 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetDraft.java
@@ -7,6 +7,7 @@
 import java.time.LocalDateTime;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -33,12 +34,14 @@
      * 浼氳涓婚
      */
     @TableField(value = "title")
+    @Excel(name = "浼氳涓婚")
     private String title;
 
     /**
      * 涓绘寔浜�
      */
     @TableField(value = "host")
+    @Excel(name = "涓绘寔浜�")
     private String host;
 
     /**
@@ -69,6 +72,7 @@
      * 鍙備細浜烘暟
      */
     @TableField(value = "participants")
+    @Excel(name = "鍙備細浜烘暟")
     private Integer participants;
 
     /**

--
Gitblit v1.9.3