报废流程问题修复

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

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

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

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

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

@@ -413,7 +413,7 @@
         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_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 != ''">
             and mtr.user_id = #{userId}

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

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