From b1906e1263bad77d22f60dd87ade8453ad33ba26 Mon Sep 17 00:00:00 2001 From: hongchao <3228015117@qq.com> Date: Thu, 12 Jun 2025 19:12:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E6=B5=81=E7=A8=8B=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java | 2 ++ .../material/service/impl/ScrapApplyDetailsServiceImpl.java | 2 ++ .../src/main/resources/mapper/base/RepairMapper.xml | 2 +- .../resources/mapper/material/ScrapApplyDetailsMapper.xml | 6 ++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java index 863e0ea..2eea091 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java @@ -274,4 +274,6 @@ public interface ScrapApplyDetailsMapper List selectAuditRepairListNew(int parentId); int updateAuditNum(RepairAuditDetailsNew bean); + + int updateScrapStatus(int parentId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index e198d82..91365d9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/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 auditList = scrapApplyDetailsMapper.selectAuditRepairListNew(parentId); //驳回时返回库存 for (RepairAuditDetailsNew bean : auditList) { diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml index c63b4e3..c6b6c32 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml +++ b/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 and mtr.user_id = #{userId} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml index 5c7bdb1..7b6b654 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml +++ b/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 repair_audit_details + set status = 3 + where parent_id = #{parentId} + \ No newline at end of file