bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料审核bug

This commit is contained in:
mashuai 2024-06-18 17:38:08 +08:00
parent 926c07a059
commit 43ca5391e7
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java
View File

@ -21,6 +21,10 @@ public class BackApplyDto {
@ApiModelProperty(value = "退料ID") @ApiModelProperty(value = "退料ID")
private Long id; private Long id;
/** 退料内部ID */
@ApiModelProperty(value = "退料内部ID")
private Long innerId;
@ApiModelProperty(value="同一退料单中不同器具状态") @ApiModelProperty(value="同一退料单中不同器具状态")
private String status; private String status;

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -481,6 +481,7 @@ public class BackApplyServiceImpl implements BackApplyService {
} }
} }
} }
//审核成功，赋值任务状态38
if (num == taskIdById.size()) { if (num == taskIdById.size()) {
dto.setTaskStatus("38"); dto.setTaskStatus("38");
backApplyMapper.updateTmTaskAll(dto); backApplyMapper.updateTmTaskAll(dto);
@ -497,7 +498,8 @@ public class BackApplyServiceImpl implements BackApplyService {
if (CollUtil.isNotEmpty(dto.getBackApplyList())) { if (CollUtil.isNotEmpty(dto.getBackApplyList())) {
for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) { for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) {
for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) { for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) {
dto.setAuditNum(backApplyDetail.getNum()); dto.setInnerId(backApplyListDto.getId());
dto.setAuditNum(backApplyDetail.getPreNum());
re = backApplyMapper.auditAll(dto); re = backApplyMapper.auditAll(dto);
} }
} }

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW() SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE WHERE
bai.id = #{id} bai.id = #{innerId}
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId} and bai.company_id = #{companyId}
</if> </if>