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

装备管理 youhua

This commit is contained in:
lizhenhua 2025-07-10 15:47:00 +08:00
parent 9d0d798e1a
commit 21e47c1c78
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java
View File

@ -176,6 +176,9 @@ public class DevInfoVo extends DevInfo {
private String devicenewName; private String devicenewName;
private String deviceId;
private String deviceTypeName; private String deviceTypeName;
} }

1
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/EquipmentDetail.java
View File

@ -54,6 +54,7 @@ public class EquipmentDetail {
private String orderCount; private String orderCount;
private String combinedName; private String combinedName;
private String labelVol; private String labelVol;
private String typeId;
} }

2
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml
View File

@ -57,7 +57,7 @@
LEFT JOIN ma_type mt1 ON mt1.type_id = mt2.parent_id LEFT JOIN ma_type mt1 ON mt1.type_id = mt2.parent_id
AND mt1.del_flag = '0' AND mt1.del_flag = '0'
WHERE WHERE
d.is_active = '1' and d.device_name=#{devicenewName} AND d.own_co=#{companyName} d.is_active = '1' and mt3.type_id=#{deviceId} AND d.own_co=#{companyName}
</select> </select>
<insert id="insertOrUpdateBatch" parameterType="com.bonus.material.equipment.domain.DeptEquipmentConfig"> <insert id="insertOrUpdateBatch" parameterType="com.bonus.material.equipment.domain.DeptEquipmentConfig">