feat(WmsAnnealPerformance): 添加当前钢卷号和逻辑库区ID筛选功能
- 在WmsAnnealPerformanceBo中新增currentCoilNo和warehouseId字段 - 在Mapper XML中添加currentCoilNo和warehouseId的查询条件 - 修改JOIN条件以支持多字段筛选 - 在服务实现中添加对新字段的筛选逻辑 - 更新注释内容以反映新的筛选条件
This commit is contained in:
@@ -20,6 +20,13 @@
|
||||
<if test="enterCoilNo != null and enterCoilNo != ''">
|
||||
AND mc.enter_coil_no LIKE CONCAT('%', #{enterCoilNo}, '%')
|
||||
</if>
|
||||
<!-- 当前钢卷号和逻辑库区id匹配 -->
|
||||
<if test="currentCoilNo != null and currentCoilNo != ''">
|
||||
AND mc.current_coil_no LIKE CONCAT('%', #{currentCoilNo}, '%')
|
||||
</if>
|
||||
<if test="warehouseId != null">
|
||||
AND mc.warehouse_id = #{warehouseId}
|
||||
</if>
|
||||
</where>
|
||||
</sql>
|
||||
|
||||
@@ -42,7 +49,7 @@
|
||||
p.end_time AS endTime
|
||||
FROM wms_furnace_plan p
|
||||
LEFT JOIN wms_furnace f ON f.furnace_id = p.target_furnace_id
|
||||
<if test="enterCoilNo != null and enterCoilNo != ''">
|
||||
<if test="enterCoilNo != null and enterCoilNo != '' or currentCoilNo != null and currentCoilNo != '' or warehouseId != null">
|
||||
INNER JOIN wms_furnace_plan_coil pc ON pc.plan_id = p.plan_id AND pc.del_flag = 0
|
||||
INNER JOIN wms_material_coil mc ON mc.coil_id = pc.coil_id AND mc.del_flag = 0
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user