1. 结算作废校验

src/main/java/com/ydtech/modules/fnc/controller/SettlementDocumentaryFeesController.java

@@ -45,7 +45,7 @@ public class SettlementDocumentaryFeesController extends BaseController {
     @ApiModelProperty(value = "作废开票")
     public HttpResult<Object> voidInvoicing(@RequestBody SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {
         HttpResult<Object>  result= settlementDocumentaryFeesService.voidInvoicing(settlementDocumentaryFeesVo);
-        return HttpResult.ok("作废成功");
+        return HttpResult.ok(result);
     }
 
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1769,6 +1769,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     @Transactional
     public HttpResult<Object> batchInvoic(InsPlyIncomeVo insPlyIncomeVo) {
 
+
         SettlementDocumentaryFeesVo settlementDocumentaryFeesVo = new SettlementDocumentaryFeesVo();  // 生成跟单费结算表
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
             settlementDocumentaryFeesVo.setTimeFrame(insPlyIncomeVo.getYear());//年度

src/main/java/com/ydtech/modules/fnc/service/impl/SettlementDocumentaryFeesServiceImpl.java

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.gson.Gson;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
 import com.ydtech.modules.fnc.dao.SettlementDocumentaryFeesMapper;
@@ -182,8 +183,12 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
     public HttpResult<Object> voidInvoicing(SettlementDocumentaryFeesVo settlementDocumentaryFeesVo) {
         SettlementDocumentaryFeesEntity oldSettlementDocumentaryFeesEntity = baseMapper.selectById(settlementDocumentaryFeesVo.getId());
 
-        if(settlementDocumentaryFeesVo.getReadyCommissionFeevalue()  !=null  && settlementDocumentaryFeesVo.getReadyCommissionFeevalue().compareTo(BigDecimal.ZERO) !=0){
-            return HttpResult.error("已经结算该数据不能作废");
+        List<SettlementDocumentaryFeesEntity> list = lambdaQuery().eq(SettlementDocumentaryFeesEntity::getParentId, settlementDocumentaryFeesVo.getId())
+                .eq(SettlementDocumentaryFeesEntity::getSettlementStatus, "2")
+                .list();
+
+        if (!list.isEmpty()) {
+            throw new SystemException("已经结算该数据不能作废");
         }
 
         String taskId = oldSettlementDocumentaryFeesEntity.getTaskId();
@@ -205,12 +210,12 @@ public class SettlementDocumentaryFeesServiceImpl extends ServiceImpl<Settlement
         BeanUtils.copyProperties(settlementDocumentaryFeesVo, settlementDocumentaryFeesEntity);
         settlementDocumentaryFeesEntity.setSettlementStatus("3");  // 3  为作废
         baseMapper.updateById(settlementDocumentaryFeesEntity);
-        return  HttpResult.ok();
+        return HttpResult.ok();
     }
 
     @Override
     public List<SettlementDocumentaryFeesEntity> queryNew(HashMap<String, Object> params) {
-        return   baseMapper.queryNew(params);
+        return baseMapper.queryNew(params);
 
 
     }