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/compensationperformance/service/CompensationPerformanceService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java b/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
index 547fbf8..a7af9a4 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/CompensationPerformanceService.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
+import java.util.List;
+
/**
* @author :yys
* @date : 2025/8/8 9:55
@@ -14,9 +16,17 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param page
- * @param compensationPerformance
+ * @param page 鍒嗛〉鎻掍欢
+ * @param staffName 鍛樺伐濮撳悕
+ * @param payDateStr 钖祫鏃ユ湡
* @return
*/
- IPage<CompensationPerformance> listPage(Page page, CompensationPerformance compensationPerformance);
+ IPage<CompensationPerformance> listPage(Page page, String staffName, String payDateStr);
+
+ /**
+ * 瀵煎嚭浜哄憳鏂板
+ *
+ * @return 浜哄憳钖祫
+ */
+ List<CompensationPerformance> exportList();
}
--
Gitblit v1.9.3