From 2c78cd7347e57c4e1286e134e140c6a82be92dcb Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 26 Jul 2023 11:34:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E4=BD=9C=E5=BA=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qs/serve/modules/tbs/common/TbsCostApplyState.java     | 2 +-
 .../modules/tbs/service/impl/TbsCostApplyServiceImpl.java      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java
index b06854f1..4daeaf93 100644
--- a/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java
+++ b/src/main/java/com/qs/serve/modules/tbs/common/TbsCostApplyState.java
@@ -15,7 +15,7 @@ import java.util.List;
 @AllArgsConstructor
 public enum TbsCostApplyState {
 
-    //状态:0=未发布；1=审批中；2=待执行；3=完成；4-被驳回;5-中止
+    //状态:0=未发布；1=审批中；2=待执行；3=完成；4-被驳回;5-中止;6-作废
     State_0_unPublish(0),
     State_1_apply(1),
     State_2_actioning(2),
diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index b93c4222..bc48ac96 100644
--- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
@@ -116,6 +116,9 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         if(count>0){
             Assert.throwEx("含核销记录不可作废");
         }
+        TbsCostApply costApply4Update = new TbsCostApply();
+        costApply4Update.setId(id);
+        costApply4Update.setChargeState(TbsCostApplyState.State_6_remove.getCode());
         //删除费用占用的预算
         LambdaQueryWrapper<TbsBudgetLog> rmLogLqw = new LambdaQueryWrapper<>();
         rmLogLqw.eq(TbsBudgetLog::getCostApplyId,id);