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/RulesRegulationsManagement.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
index 80dc338..cc32e10 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagement.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.approve.utils.ListToStringTypeHandler;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
@@ -20,17 +21,20 @@
      * 鍒跺害缂栧彿
      */
     @ApiModelProperty("鍒跺害缂栧彿")
+    @Excel(name = "鍒跺害缂栧彿")
     private String regulationNum;
 
     /**
      * 鏍囬
      */
     @ApiModelProperty("鏍囬")
+    @Excel(name = "鏍囬")
     private String title;
     /**
      * 鍒跺害鍒嗙被
      */
     @ApiModelProperty("鍒跺害鍒嗙被")
+    @Excel(name = "鍒跺害鍒嗙被", readConverterExp = "finance=璐㈠姟鍒跺害,hr=浜轰簨鍒跺害,safety=瀹夊叏鍒跺害,tech=鎶�鏈埗搴�")
     private String category;
     /**
      * 鍒跺害鍐呭
@@ -59,16 +63,19 @@
      * 鐗堟湰
      */
     @ApiModelProperty("鐗堟湰")
+    @Excel(name = "鐗堟湰")
     private String version;
     /**
      * 鐘舵��
      */
     @ApiModelProperty("鐘舵��")
+    @Excel(name = "鐘舵��", readConverterExp = "repealed=宸插簾姝�,active=鐢熸晥涓�")
     private String status;
     /**
      * 宸茶浜烘暟
      */
     @ApiModelProperty("宸茶浜烘暟")
+    @Excel(name = "宸茶浜烘暟")
     private Integer readCount;
     /**
      * 鍒涘缓鑰�
@@ -82,6 +89,7 @@
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
     /**
      * 淇敼浜�

--
Gitblit v1.9.3