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/stock/dto/FinishedProductTreeDto.java | 34 ++++++++++++++++++++++++----------
1 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java b/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
index 9f78801..a17d163 100644
--- a/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/FinishedProductTreeDto.java
@@ -1,31 +1,45 @@
package com.ruoyi.stock.dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@Data
+@ApiModel(value = "FinishedProductTreeDto", description = "鎴愬搧鏍戝舰DTO")
public class FinishedProductTreeDto {
- private Long id;
-
- private Long parentId;
-
- private String productName;
-
- private String label;
-
+ @ApiModelProperty(value = "浜у搧ID")
private Long productId;
+ @ApiModelProperty(value = "浜у搧鍚嶇О")
+ private String productName;
+
+ @ApiModelProperty(value = "鏍囩/鏄剧ず鍚嶇О")
+ private String label;
+
+ @ApiModelProperty(value = "搴撳瓨ID")
+ private Long stockId;
+
+ @ApiModelProperty(value = "浜у搧鍨嬪彿ID")
private Long productModelId;
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
- private String materialCode;
-
+ @ApiModelProperty(value = "宸ュ簭绫诲埆")
private String processCategory;
+ @ApiModelProperty(value = "鐢靛帇")
private String voltage;
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ private String materialCode;
+
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty(value = "瀛愯妭鐐瑰垪琛�")
private List<FinishedProductTreeDto> children;
}
--
Gitblit v1.9.3