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/MeetingRoom.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
index edf603a..9742071 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/MeetingRoom.java
@@ -5,6 +5,8 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
/**
@@ -24,30 +26,35 @@
* 浼氳瀹ゅ悕绉�
*/
@TableField(value = "name")
+ @Excel(name = "浼氳瀹ゅ悕绉�")
private String name;
/**
* 浣嶇疆
*/
@TableField(value = "location")
+ @Excel(name = "浣嶇疆")
private String location;
/**
* 瀹圭撼浜烘暟
*/
@TableField(value = "capacity")
+ @Excel(name = "瀹圭撼浜烘暟")
private Integer capacity;
/**
* 璁惧閰嶇疆锛堥�楀彿鍒嗛殧锛�
*/
@TableField(value = "equipment")
+ @Excel(name = "璁惧閰嶇疆")
private String equipment;
/**
* 鐘舵�侊紙1:鍚敤 0:绂佺敤锛�
*/
@TableField(value = "status")
+ @Excel(name = "鐘舵��", readConverterExp = "1=鍚敤,0=绂佺敤")
private Integer status;
/**
--
Gitblit v1.9.3