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/safe/SafeAccidentMapper.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/safe/SafeAccidentMapper.xml b/src/main/resources/mapper/safe/SafeAccidentMapper.xml
index 159e7cd..c7dc368 100644
--- a/src/main/resources/mapper/safe/SafeAccidentMapper.xml
+++ b/src/main/resources/mapper/safe/SafeAccidentMapper.xml
@@ -27,7 +27,7 @@
</resultMap>
<select id="pageSafeAccident" resultType="com.ruoyi.safe.pojo.SafeAccident">
select sa.*,
- su.nick_name createUserName,
+ su.nick_name createUserName
from safe_accident sa
left join sys_user su on sa.create_user = su.user_id
where 1=1
@@ -35,13 +35,13 @@
and sa.accident_code like concat('%', #{c.accidentCode}, '%')
</if>
<if test="c.accidentName != null and c.accidentName != ''">
- and sa.accident_name like concat('%', #{accidentName}, '%')
+ and sa.accident_name like concat('%', #{c.accidentName}, '%')
</if>
<if test="c.accidentType != null and c.accidentType != ''">
- and sa.accident_type like concat('%', #{accidentType}, '%')
+ and sa.accident_type like concat('%', #{c.accidentType}, '%')
</if>
<if test="c.accidentGrade != null and c.accidentGrade != ''">
- and sa.accident_grade like concat('%', #{accidentGrade}, '%')
+ and sa.accident_grade like concat('%', #{c.accidentGrade}, '%')
</if>
</select>
--
Gitblit v1.9.3