代码提交

This commit is contained in:
liang.chao 2025-09-04 21:00:15 +08:00
parent 6ba1e886f3
commit f8fc86dc2c
1 changed files with 30 additions and 20 deletions

View File

@ -470,19 +470,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
IFNULL(mt.storage_num, 0)
END AS num,
'在库' AS status
FROM ma_machine mm
LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
FROM
ma_type mt
LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE mm.ma_code is not null and mm.ma_status in (1) and mt.`level` = 4
WHERE
mt.LEVEL = 4
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
</if>
GROUP BY mt.type_id
AND (
mt.manage_type != 0
OR (
mt.manage_type = 0
AND mm.ma_code IS NOT NULL
AND mm.ma_status IN (1)
))
GROUP BY
mt.type_id
</select>
<select id="getAllMacheDetails" resultType="com.bonus.material.push.domain.MachineInfoBean">
( SELECT