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 ServiceImpl0){ Assert.throwEx("含核销记录不可作废"); } + TbsCostApply costApply4Update = new TbsCostApply(); + costApply4Update.setId(id); + costApply4Update.setChargeState(TbsCostApplyState.State_6_remove.getCode()); //删除费用占用的预算 LambdaQueryWrapper rmLogLqw = new LambdaQueryWrapper<>(); rmLogLqw.eq(TbsBudgetLog::getCostApplyId,id);