diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java index 3f265c77..aa48ca67 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyDto.java @@ -21,6 +21,10 @@ public class BackApplyDto { @ApiModelProperty(value = "退料ID") private Long id; + /** 退料内部ID */ + @ApiModelProperty(value = "退料内部ID") + private Long innerId; + @ApiModelProperty(value="同一退料单中不同器具状态") private String status; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index ba0ea659..15c63bb4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -473,6 +473,7 @@ public class BackApplyServiceImpl implements BackApplyService { } } } + //审核成功,赋值任务状态38 if (num == taskIdById.size()) { dto.setTaskStatus("38"); backApplyMapper.updateTmTaskAll(dto); @@ -489,7 +490,8 @@ public class BackApplyServiceImpl implements BackApplyService { if (CollUtil.isNotEmpty(dto.getBackApplyList())) { for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) { for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) { - dto.setAuditNum(backApplyDetail.getNum()); + dto.setInnerId(backApplyListDto.getId()); + dto.setAuditNum(backApplyDetail.getPreNum()); re = backApplyMapper.auditAll(dto); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index 30a5fcf2..63b9b1cc 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -348,7 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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() WHERE - bai.id = #{id} + bai.id = #{innerId} and bai.company_id = #{companyId}