bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
mashuai 2025-08-14 13:49:22 +08:00
parent 0de34998f7 3f2b0fdea3
commit d5e9f0664c
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
View File

@ -823,8 +823,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
( (
SELECT SELECT
wmi.id as maId, wmi.id as maId,
mt2.type_name as maName, wmi.ma_name as maName,
mt.type_name as maModel, wmi.ma_model as maModel,
wmi.ma_code as maCode, wmi.ma_code as maCode,
wmi.qr_code as qrCode, wmi.qr_code as qrCode,
wmi.model_id as typeId, wmi.model_id as typeId,
@ -837,12 +837,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wmi.this_check_time as thisCheckTime, wmi.this_check_time as thisCheckTime,
wmi.next_check_time as nextCheckTime, wmi.next_check_time as nextCheckTime,
'' as inOutNum, '' as inOutNum,
mt.jiju_type as jiJuType, '1' as jiJuType,
mt.is_check as isCheck, '' as isCheck,
'1' as devType '1' as devType
FROM ws_ma_info wmi FROM ws_ma_info wmi
LEFT JOIN ma_type mt ON mt.type_id = wmi.model_id
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
WHERE WHERE
1=1 1=1
<if test="maCode != null"> and wmi.ma_code LIKE CONCAT('%',#{maCode}, '%')</if> <if test="maCode != null"> and wmi.ma_code LIKE CONCAT('%',#{maCode}, '%')</if>
@ -854,8 +852,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getElectronicLabelByWsMaInfo" resultType="com.bonus.material.ma.domain.Machine"> <select id="getElectronicLabelByWsMaInfo" resultType="com.bonus.material.ma.domain.Machine">
SELECT SELECT
wmi.id as maId, wmi.id as maId,
mt2.type_name AS materialName, wmi.ma_name AS materialName,
mt.type_name AS materialModel, wmi.ma_model AS materialModel,
wmi.ma_code as maCode, wmi.ma_code as maCode,
wmi.this_check_time as thisCheckTime, wmi.this_check_time as thisCheckTime,
wmi.next_check_time as nextCheckTime, wmi.next_check_time as nextCheckTime,
@ -868,8 +866,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wmi.model_id as typeId wmi.model_id as typeId
FROM FROM
ws_ma_info wmi ws_ma_info wmi
LEFT JOIN ma_type mt ON mt.type_id = wmi.model_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
WHERE WHERE
wmi.ma_code like concat('%', #{maCode}, '%') wmi.ma_code like concat('%', #{maCode}, '%')
<if test="maId != null"> <if test="maId != null">
@ -879,8 +875,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getHisByCodeNewByWsMaInfo" resultType="com.bonus.material.ma.domain.Machine"> <select id="getHisByCodeNewByWsMaInfo" resultType="com.bonus.material.ma.domain.Machine">
SELECT SELECT
wmi.id as maId, wmi.id as maId,
mt2.type_name as maName, wmi.ma_name as maName,
mt.type_name as maModel, wmi.ma_model as maModel,
wmi.ma_code as maCode, wmi.ma_code as maCode,
wmi.qr_code as qrCode, wmi.qr_code as qrCode,
wmi.model_id as typeId, wmi.model_id as typeId,
@ -893,12 +889,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
wmi.this_check_time as thisCheckTime, wmi.this_check_time as thisCheckTime,
wmi.next_check_time as nextCheckTime, wmi.next_check_time as nextCheckTime,
'' as inOutNum, '' as inOutNum,
mt.jiju_type as jiJuType, '1' as jiJuType,
mt.is_check as isCheck,
'1' as devType '1' as devType
FROM ws_ma_info wmi FROM ws_ma_info wmi
LEFT JOIN ma_type mt ON mt.type_id = wmi.model_id
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
WHERE WHERE
1=1 1=1
<if test="maCode != null"> and wmi.ma_code LIKE CONCAT('%',#{maCode}, '%')</if> <if test="maCode != null"> and wmi.ma_code LIKE CONCAT('%',#{maCode}, '%')</if>