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/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
index b8ad6a7..5da6dff 100644
--- a/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
+++ b/src/main/resources/mapper/collaborativeApproval/SealApplicationManagementMapper.xml
@@ -4,12 +4,17 @@
<select id="listPage" resultType="com.ruoyi.collaborativeApproval.dto.SealApplicationManagementDTO">
- select sam.*, su.user_name as create_user_name, d.dept_name as department
+ select sam.*, su.user_name as create_user_name, d.dept_name as department,
+ su1.nick_name as approveUserName
from seal_application_management sam
left join sys_user su on sam.create_user = su.user_id
+ left join sys_user su1 on sam.approve_user_id = su1.user_id
left join sys_user_dept sud on su.user_id = sud.user_id
left join sys_dept d on sud.dept_id = d.dept_id
<where>
+ <if test="ew.applicationNum != null and ew.applicationNum != ''">
+ and sam.application_num like concat('%',#{ew.applicationNum},'%')
+ </if>
<if test="ew.title != null and ew.title != ''">
and sam.title like concat('%',#{ew.title},'%')
</if>
@@ -18,4 +23,4 @@
</if>
</where>
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3