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/inspectiontask/dto/InspectionTaskDto.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
index f92bde5..87e3e61 100644
--- a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
+++ b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
@@ -3,6 +3,7 @@
import com.ruoyi.basic.dto.StorageBlobDTO;
import com.ruoyi.basic.pojo.StorageAttachment;
import com.ruoyi.inspectiontask.pojo.InspectionTask;
+import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;
import java.util.List;
@@ -10,11 +11,16 @@
@Data
public class InspectionTaskDto extends InspectionTask {
- private List<StorageBlobDTO> storageBlobDTO;
- private List<StorageBlobDTO> beforeProduction;
- private List<StorageBlobDTO> afterProduction;
- private List<StorageBlobDTO> productionIssues;
+// private List<StorageBlobDTO> storageBlobDTO;
+// private List<StorageBlobDTO> beforeProduction;
+// private List<StorageBlobDTO> afterProduction;
+// private List<StorageBlobDTO> productionIssues;
+//
+// private List<StorageAttachment> attachments;
- private List<StorageAttachment> attachments;
+ private List<String> tempFileIds;
+ private List<CommonFile> commonFileList; //鐢熶骇涓�
+ private List<CommonFile> commonFileListAfter; //鐢熶骇鍚�
+ private List<CommonFile> commonFileListBefore; //鐢熶骇鍓�
}
--
Gitblit v1.9.3