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/production/dto/ProductionProductMainDto.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 8691a21..d304a54 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -33,6 +33,12 @@
@Excel(name = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty = BigDecimal.ZERO;
+ // 涓嶈壇鏁伴噺
+ @ApiModelProperty(value = "涓嶈壇鏁伴噺")
+ @Excel(name = "涓嶈壇鏁伴噺")
+ private BigDecimal defectiveQuantity = BigDecimal.ZERO;
+
+ // 鍚堟牸鏁伴噺
@ApiModelProperty(value = "鍚堟牸鏁伴噺")
@Excel(name = "鍚堟牸鏁伴噺")
private BigDecimal qualifiedQty = BigDecimal.ZERO;
@@ -44,6 +50,9 @@
//浜у搧瑙勬牸鍨嬪彿
@Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
+ //鏂欏彿
+ @Excel(name = "鏂欏彿")
+ private String materialCode;
//鍗曚綅
@Excel(name = "鍗曚綅")
@@ -74,4 +83,10 @@
// 涓嶅悎鏍煎鐞嗙粨鏋�
@ApiModelProperty(value = "涓嶅悎鏍煎鐞嗙粨鏋�")
private String dealResult;
+
+ @ApiModelProperty(value = "鐢熶骇鎵瑰彿")
+ private String batchNo;
+
+ @ApiModelProperty(value = "浜у搧缁撴瀯鎶曞叆鏁伴噺")
+ private BigDecimal inputWeight;
}
--
Gitblit v1.9.3