问题优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1117,6 +1117,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         dataMap.put("saleType", baseVehicleOutApply.getSaleTypeValue());
         //销售日期
         dataMap.put("saleDate", baseVehicleOutApply.getSaleDate());
+        //合同编号
+        dataMap.put("conNo", baseVehicleOutApply.getContractNo());
         //单据编号
         dataMap.put("billNo", baseVehicleOutApply.getBillNo());
         //客户名称电话
@@ -1453,9 +1455,8 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             bdCustomer.setTOrgIds(basePurchaseSystemDetailsVo.getOrgCode());
             //出库类型是否为全款车（001全款车）
             if (!"001".equals(payTypeKey)) {//贷款
-                String num = String.format("%02d", j);
-                String FNumber = baseVehicleZSOutApplyDto.getContractNo() + num;
-                j = j + 1;
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleZSOutApplyDto.getContractNo(),dto.getVinSid()).getData();
+                String FNumber = busSalesOrderVehicle.getTemporaryNo();
                 Boolean aBoolean = finKingDeeFeign.customerExistState(FNumber).getData();
                 if (!aBoolean) {
                     bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + dto.getVinNo().substring(dto.getVinNo().length() - 8));
@@ -1464,7 +1465,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     bdCustomers.add(bdCustomer);
                     finKingDeeFeign.draftBdCustomers(bdCustomers);
                 } else {
-                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.fetchByLSBM(FNumber).getData();
                     //修改客户简称为合同编号
                     bdCustomer.setFName(baseVehicleZSOutApplyDto.getCustomerName() + busSalesOrderVehicle.getLinkNo().substring(busSalesOrderVehicle.getLinkNo().length() - 8));
                     bdCustomer.setFShortName(baseVehicleZSOutApplyDto.getCustomerName() + busSalesOrderVehicle.getLinkNo());

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -94,7 +94,7 @@ public interface BusSalesOrderVehicleFeign {
     @PostMapping("/getCanUseCarsPage")
     ResultBean<PagerVo<List<QCarVo>>> getCanUseCarsPage(@RequestBody PagerQuery<QCarQuery> pagerQuery);
 
-    @ApiOperation("根据临时编码查询车辆信息")
+    @ApiOperation("根据车辆sid和合同编码查询客户临时编码")
     @GetMapping("/fetchByLSBM/{fNumber}")
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> fetchByLSBM(@PathVariable("fNumber") String fNumber);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPTrailerVo.java

@@ -13,8 +13,10 @@ import lombok.Data;
 public class BusVehicleQKKPTrailerVo implements Vo {
 
     @ApiModelProperty("挂车车架号")
-    private String gcVinNo; // 挂车车架号
+    private String gcVinNo;
     @ApiModelProperty("车架号")
-    private String vinNo; // 车架号
+    private String vinNo;
+    @ApiModelProperty("挂车开票金额")
+    private String oneBillMoney;
 
 }

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

@@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
 import com.yxt.anrui.base.api.basetrailer.TrailerVo;
 import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
@@ -307,6 +308,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                         BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo();
                         busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo());
                         busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                        BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
+                        busVehicleQKKPTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
                         busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo);
                         busVehicleQKKPVo.setTrailers(busVehicleQKKPTrailerVos);
                     }

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

@@ -446,7 +446,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
                 finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
-                finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
                 List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                 List<String> hgzImageUrls = new ArrayList<>();
                 for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java

@@ -67,7 +67,7 @@ public class FinBillTrailerVo implements Vo {
     @ApiModelProperty("开票信息")
     private String invoiceInfo;
 	@ApiModelProperty("单台开票金额")
-    private String oneBillMoney; // 单台开票金额
+    private String oneBillMoney;
     @ApiModelProperty("合格证图片")
     private List<String> files;
 }