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

退料管理

This commit is contained in:
mashuai 2024-11-13 18:53:14 +08:00
parent 3806ae330a
commit 1e4fb18018
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/domain/MaCodeDto.java
View File

@ -26,6 +26,14 @@ public class MaCodeDto {
@ApiModelProperty(value = "机具外观判断") @ApiModelProperty(value = "机具外观判断")
private String apDetection; private String apDetection;
private String typeId;
private String materialName;
private String typeName;
private String maStatus;
/** /**
* 附件列表 * 附件列表
*/ */

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
View File

@ -131,6 +131,10 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
maCodeDto.setMaCode(maCodeVo.getMaCode()); maCodeDto.setMaCode(maCodeVo.getMaCode());
maCodeDto.setMaId(maCodeVo.getMaId()); maCodeDto.setMaId(maCodeVo.getMaId());
maCodeDto.setApDetection(maCodeVo.getApDetection()); maCodeDto.setApDetection(maCodeVo.getApDetection());
maCodeDto.setTypeName(maCodeVo.getTypeName());
maCodeDto.setMaterialName(maCodeVo.getMaterialName());
maCodeDto.setTypeId(maCodeVo.getTypeId());
maCodeDto.setMaStatus(maCodeVo.getMaStatus());
// 查询并设置编码附件 // 查询并设置编码附件
List<BmFileInfo> bmFileInfoList = fetchBmFileInfos(details.getId(), maCodeVo.getMaId()); List<BmFileInfo> bmFileInfoList = fetchBmFileInfos(details.getId(), maCodeVo.getMaId());
if (CollectionUtils.isNotEmpty(bmFileInfoList)) { if (CollectionUtils.isNotEmpty(bmFileInfoList)) {

5
bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml
View File

@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
LEFT JOIN bm_agreement_info ba ON tta.agreement_id = ba.agreement_id LEFT JOIN bm_agreement_info ba ON tta.agreement_id = ba.agreement_id
WHERE WHERE
1 = 1 1 = 1 and mm.ma_status = '2'
<if test="unitId != null"> <if test="unitId != null">
and ba.unit_id = #{unitId} and ba.unit_id = #{unitId}
</if> </if>
@ -186,7 +186,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bcd.type_id AS typeId, bcd.type_id AS typeId,
mt.type_name AS materialName, mt.type_name AS materialName,
mt1.type_name AS typeName, mt1.type_name AS typeName,
bcd.ap_detection AS apDetection bcd.ap_detection AS apDetection,
mm.ma_status AS maStatus
FROM FROM
back_check_details bcd back_check_details bcd
left join ma_machine mm on bcd.ma_id = mm.ma_id left join ma_machine mm on bcd.ma_id = mm.ma_id