欠款开票

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.TrailerVo;
+import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehicle.app.GetVinQuery;
@@ -3835,7 +3836,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         IPage<BaseVehicleQKKPVo> page = vehicleQKKPPageList(pagerQuery);
         List<BaseVehicleQKKPTrailerVo> baseVehicleQKKPTrailerVos = new ArrayList<>();
         for (BaseVehicleQKKPVo record : page.getRecords()) {
-            List<TrailerVo> trailerVos = baseTrailerService.trailerList(record.getVehSid()).getData();
+            TraliveredVo data = baseTrailerService.trailerList(record.getVehSid()).getData();
+            List<TrailerVo> trailerVos = data.getList();
             if (trailerVos != null && trailerVos.size() > 0){
                 for (TrailerVo trailerVo : trailerVos) {
                     BaseVehicleQKKPTrailerVo baseVehicleQKKPTrailerVo = new BaseVehicleQKKPTrailerVo();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -1567,6 +1567,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean submitFinBillApplicationQK(SubmitFinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        String contractNo = dto.getContractNo();
+        List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
+        if (finBillApplicationDetailsVos != null){
+            for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) {
+                String nodeState = finBillApplicationDetailsVo.getNodeState();
+                if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)){
+                    return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交");
+                }
+            }
+        }
         //用户的组织全路径
         String orgSidPath = "";
         if (StringUtils.isNotBlank(dto.getOrgSidPath())) {