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

Merge branch 'master' of http://192.168.0.56:3000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2024-12-26 14:40:22 +08:00
parent 8e8cdb0931 55ce855d68
commit 4ede2fa2a2
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseOutDetails.java
View File

@ -48,6 +48,9 @@ public class LeaseOutDetails extends BaseEntity {
@ApiModelProperty(value = "机具状态")
private String maStatus;
@ApiModelProperty(value = "机具状态名称")
private String statusName;
@ApiModelProperty(value = "二维码code")
private String qrCode;

7
bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -170,14 +170,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService {
record.setOutType(InputOutEnum.NUMBER_DEVICE.getTypeId());
} else if (record.getManageType().equals(MaTypeManageTypeEnum.CODE_DEVICE.getTypeId())) {
record.setOutType(InputOutEnum.CODE_DEVICE.getTypeId());
} else if (record.getManageType().equals(InputOutEnum.STANDARD_BOX.getTypeId())) {
// 标准箱
record.setOutType(InputOutEnum.STANDARD_BOX.getTypeId());
} else if (record.getManageType().equals(InputOutEnum.QR_CODE.getTypeId())) {
// 二维码
record.setOutType(InputOutEnum.QR_CODE.getTypeId());
}
res = checkStorageNum(record);
if (res > 0) {

5
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyDetailsMapper.xml
View File

@ -243,7 +243,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mm.ma_code as maCode,
mm.type_id as typeId,
mm.ma_status as maStatus,
mm.qr_code as qrCode
mm.qr_code as qrCode,
case when mm.ma_status = '1' then '在库'
else ''
end as statusName
FROM ma_machine mm
LEFT JOIN ma_type mt ON mm.type_id = mt.type_id AND mt.del_flag = '0'
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id AND mt1.del_flag = '0'