问题优化

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

@@ -50,6 +50,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -136,6 +137,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     private BaseTrailerService baseTrailerService;
     @Autowired
     private FinBillVehicleFeign finBillVehicleFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
 
     /**
      * 车辆信息分页列表
@@ -3890,6 +3893,12 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (params.getVinSids().size() > 0) {
             qw.notIn("bsov.linkSid", params.getVinSids());
         }
+        //查询是否存在应收未收款项
+        ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo());
+        if(!listResultBean.getData().isEmpty()){
+            listResultBean.getData().removeAll(Collections.singleton(null));
+            qw.notIn("bsov.sid",listResultBean.getData());
+        }
         return baseMapper.vehicleQKKPPageList(page, qw);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -276,6 +276,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 qw.notIn("bsov.linkSid", query.getVinSids());
             }
         }
+        //查询是否存在应收未收款项
+        ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo());
+        if(!listResultBean.getData().isEmpty()){
+            listResultBean.getData().removeAll(Collections.singleton(null));
+            qw.notIn("bsov.sid",listResultBean.getData());
+        }
         List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw);
         List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>();
         List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>();

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

@@ -427,13 +427,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
         String contractNo = entity.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationVos = baseMapper.selectByContractNo(contractNo);
-        if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) {
-            FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0);
-            if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) {
-                entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()));
-                entity.setTotalBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney()).multiply(new BigDecimal(finBillVehicleVos.size())));
-            }
-        }
+        entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size())));
         FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@@ -101,10 +101,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
         if (StringUtils.isNotBlank(scmVehicleReturnDto.getOrgSidPath())){
             orgPath = scmVehicleReturnDto.getOrgSidPath();
         }else {
-            ResultBean<SysUserInfoVo> sysUserInfoVoResultBean = sysUserFeign.selectUserInfoByUserSid(scmVehicleReturnDto.getCreateBySid());
-            //取组织架构的全路径sid
-            SysStaffOrg sysStaffOrg = sysStaffOrgFeign.getOrgByStaffSid(sysUserInfoVoResultBean.getData().getStaffSid()).getData();
-            orgPath = sysStaffOrg.getOrgSidPath();
+            return rb.setMsg("orgSidPath不能为空");
         }
         String sid = scmVehicleReturnDto.getSid();
         if (StringUtils.isBlank(sid)) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListVo.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class AppCarListVo implements Vo {
     private static final long serialVersionUID = -7003788760351399800L;
@@ -12,6 +15,8 @@ public class AppCarListVo implements Vo {
     private String vin;
     @ApiModelProperty("车辆sid")
     private String vinSid;
+    @ApiModelProperty("单台开票金额")
+    private String invoiceMoney;
     @ApiModelProperty("开票类型key")
     private String invoiceTypeKey;
     @ApiModelProperty("开票类型value")
@@ -26,5 +31,6 @@ public class AppCarListVo implements Vo {
     private String certificateStateKey;
     @ApiModelProperty("合格证状态value")
     private String certificateState;
-
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -341,6 +341,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
         vo.setModelName(finBillApplicationDetailsVo.getModelName());
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        vo.setProcInsId("");
         String reasonValue = vo.getReasonValue();
         String remarks = vo.getRemarks();
         String reasonRemarks = "";
@@ -366,6 +367,8 @@ public class AppBusAdvanceGinvoiceapplyService {
                 vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid());
                 vinListVo.setInvoiceName(finBillVehicle.getOpenTickName());
                 vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks());
+                vinListVo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney());
+                vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto());
                 vinListVos.add(vinListVo);
             }
         }