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

报废流程问题修复

This commit is contained in:
hongchao 2025-06-12 19:12:21 +08:00
parent 582dccbe0b
commit b1906e1263
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java
View File

@ -274,4 +274,6 @@ public interface ScrapApplyDetailsMapper
List<RepairAuditDetailsNew> selectAuditRepairListNew(int parentId); List<RepairAuditDetailsNew> selectAuditRepairListNew(int parentId);
int updateAuditNum(RepairAuditDetailsNew bean); int updateAuditNum(RepairAuditDetailsNew bean);
int updateScrapStatus(int parentId);
} }

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -1085,6 +1085,8 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
} else { } else {
int parentId = scrapApplyDetailsMapper.getParentId(vo); int parentId = scrapApplyDetailsMapper.getParentId(vo);
//修改repair_audit_details表状态为报废驳回
scrapApplyDetailsMapper.updateScrapStatus(parentId);
List<RepairAuditDetailsNew> auditList = scrapApplyDetailsMapper.selectAuditRepairListNew(parentId); List<RepairAuditDetailsNew> auditList = scrapApplyDetailsMapper.selectAuditRepairListNew(parentId);
//驳回时返回库存 //驳回时返回库存
for (RepairAuditDetailsNew bean : auditList) { for (RepairAuditDetailsNew bean : auditList) {

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

@ -413,7 +413,7 @@
left join sys_user su on rar.create_by = su.user_id left join sys_user su on rar.create_by = su.user_id
LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
LEFT JOIN ma_type_repair mtr on mtr.type_id = rar.type_id LEFT JOIN ma_type_repair mtr on mtr.type_id = rar.type_id
where rar.type_id = #{typeId} and rad.status != 2 where rar.type_id = #{typeId} and rad.status != 2 and rad.status != 3
<if test="userId != null and userId != ''"> <if test="userId != null and userId != ''">
and mtr.user_id = #{userId} and mtr.user_id = #{userId}

6
sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
View File

@ -854,4 +854,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_time = now() update_time = now()
where id = #{repairId} where id = #{repairId}
</update> </update>
<update id="updateScrapStatus">
update repair_audit_details
set status = 3
where parent_id = #{parentId}
</update>
</mapper> </mapper>