Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/BillApplicationIInfoVoss.java

@@ -0,0 +1,97 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/10/18
+ **/
+@Data
+public class BillApplicationIInfoVoss {
+
+    @ApiModelProperty("业务sid")
+    private String sid;
+    @ApiModelProperty("出库sid")
+    private String ckSid;
+    @ApiModelProperty(value = "销售类型value")
+    private String saleType;
+    @ApiModelProperty("部门-人员名")
+    private String publishInfo;
+    @ApiModelProperty(value = "销售部门名称")
+    private String sellerDept;
+    @ApiModelProperty(value = "销售专员名称")
+    private String sellerName;
+    @ApiModelProperty("申请日期")
+    private String date;
+    @ApiModelProperty("客户名称")
+    private String name;
+    @ApiModelProperty(value = "开票单位名称")
+    private String invoicingUnit;
+    @ApiModelProperty(value = "开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty(value = "开票类型value")
+    private String openTickTypeValue;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
+    @ApiModelProperty("单台开票价")
+    private String invoiceMoney;
+    @ApiModelProperty("车辆集合")
+    private List<VinListVos> vinList;
+    @ApiModelProperty("开票总价")
+    private String invoiceTotal;
+    @ApiModelProperty("开票状态")
+    private String invoiceState;
+    @ApiModelProperty("开票状态")
+    private String invoiceStateKey;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("开票挂车信息")
+    private List<FinBillTrailerVo> finBillTrailers;
+    @ApiModelProperty("证件")
+    private List<String> idCardImages;
+    @ApiModelProperty("车辆买卖合同")
+    private List<String> carBuyContractImages;
+    @ApiModelProperty("客户开票申请书")
+    private List<String> customerInvoiceApplyImages;
+    @ApiModelProperty("车辆登记合同")
+    private List<String> registerContractImages;
+    @ApiModelProperty("确认书")
+    private List<String> invoiceApplyConfirmImages;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("是否可以编辑开票价")
+    private Boolean isCanEdit;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程实列id")
+    private String procInsId;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("车型名称")
+    private String modelName;
+    @ApiModelProperty("销售订单sid")
+    private String busSalesOrderSid;
+    @ApiModelProperty("是否显示价值客户")
+    private Boolean showValueCustomer;
+    @ApiModelProperty("是否为单独新增")
+    private Boolean showBtn;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@@ -264,4 +264,9 @@ public interface FinBillApplicationFeign {
     @PostMapping("/appQKFetchDetailsBySid")
     @ResponseBody
     public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(@RequestBody AppBillApplicationDetailsQKQuery query);
+
+    @ApiOperation("移动端开票新增初始化")
+    @GetMapping("/selectByContractNo")
+    @ResponseBody
+    ResultBean<BillApplicationIInfoVoss> selectByContractNo(@RequestParam("contractId") String contractId, @RequestParam("vins") List<String> vins);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@@ -276,4 +276,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
 	public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<BillApplicationIInfoVoss> selectByContractNo(String contractId, List<String> vins) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/VinListVos.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.fin.api.finbillapplication;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/10/18
+ **/
+@Data
+public class VinListVos {
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("开票类型")
+    private String invoiceTypeKey;
+    @ApiModelProperty("开票类型")
+    private String invoiceType;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty("开票名称")
+    private String invoiceName;
+    @ApiModelProperty("开票信息")
+    private String invoiceInfo; // 开票信息
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+    @ApiModelProperty("合格证状态value")
+    private String certificateState; // 合格证状态value
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
+}

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

@@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -87,4 +89,10 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     void updateZZ(String businessSid);
 
     List<String> getSelectBySid(String businessSid);
+
+    BusSalesOrder selectNo(String contractId);
+
+    BillApplicationIInfoVoss selectByContractNos(String contractId);
+
+    VinListVos selectByBus(@Param("contractNo") String contractId,@Param("vinSid") String s);
 }

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

@@ -143,4 +143,49 @@
         where billNo = #{qkkpBillNo}
         ORDER BY createTime DESC LIMIT 1
     </select>
+
+    <select id="selectNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from anrui_buscenter.bus_sales_order where contractNo = #{contractId}
+    </select>
+
+    <select id="selectByContractNos" resultType="com.yxt.anrui.fin.api.finbillapplication.BillApplicationIInfoVoss">
+        SELECT DISTINCT
+            bo.`sid` AS busSalesOrderSid,
+            bo.`payTypeKey` AS saleTypeKey,
+            bo.`payType` AS saleType,
+            bo.`contractNo` AS contractId,
+            bo.`staffSid`,
+            bo.`staffName` AS sellerName,
+            bo.`orgSid` AS staffDeptSid,
+            bo.`orgName` AS sellerDept,
+            bo.`customerSid`,
+            bo.`customerName` AS NAME,
+            bo.`purchaseSystemSid`,
+            bm.`modelName`,
+            bm.`modelSid`,
+            if(bo.payTypeKey =1,bo.`oneBillMoney`,(select mainVehicleAmount from anrui_riskcenter.loan_solutions where salesOrderSid = bo.sid)) AS kpMoney
+        FROM anrui_buscenter.`bus_sales_order` bo
+                JOIN anrui_buscenter.`bus_sales_order_model` bm
+                     ON bo.`sid` = bm.`salesOrderSid`
+        where bo.contractNo = #{contractId}
+    </select>
+
+    <select id="selectByBus" resultType="com.yxt.anrui.fin.api.finbillapplication.VinListVos">
+        SELECT DISTINCT
+            bv.`linkNo` AS vin,
+            bv.`linkSid` AS vinSid,
+            bc.`certificateState` AS certificateStateKey,
+            bc.`certificateStateValue` AS certificateState
+        FROM
+            anrui_buscenter.`bus_sales_order_vehicle` bv
+                JOIN anrui_buscenter.`bus_sales_order` bo
+                     ON bv.`salesOrderSid` = bo.`sid`
+                JOIN anrui_base.base_vehicle_state bs
+                     ON bv.`sid` = bs.`busSid`
+                JOIN anrui_base.`base_vehicle_certificate` bc
+                     ON bv.`linkSid` = bc.`vehicleSid`
+                JOIN anrui_buscenter.`bus_sales_order_model` bm
+                     ON bv.`salesOrderSid` = bm.`salesOrderSid`
+        where bo.contractNo = #{contractNo} and bv.linkSid = #{vinSid}
+    </select>
 </mapper>

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

@@ -335,4 +335,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
     public ResultBean<FinBillApplicationDetailsVo> appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) {
         return finBillApplicationService.appQKFetchDetailsBySid(query);
     }
+
+    @Override
+    public ResultBean<BillApplicationIInfoVoss> selectByContractNo(String contractId, List<String> vins) {
+        return finBillApplicationService.selectByContractNo(contractId,vins);
+    }
 }

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

@@ -4453,4 +4453,52 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         return imgUrl;
     }
+
+    public ResultBean<BillApplicationIInfoVoss> selectByContractNo(String contractId, List<String> vins) {
+        ResultBean<BillApplicationIInfoVoss> rb = ResultBean.fireFail();
+        BillApplicationIInfoVoss billApplicationIInfoVoss = new BillApplicationIInfoVoss();
+        BusSalesOrder busSalesOrder = baseMapper.selectNo(contractId);
+        ResultBean<BusSalesOrderDetailsVo> resultBean = busSalesOrderFeign.fetchDetailsBySid(busSalesOrder.getSid());
+        BusSalesOrderDetailsVo busSalesOrderDetailsVo = resultBean.getData();
+        billApplicationIInfoVoss = baseMapper.selectByContractNos(contractId);
+        if("1".equals(busSalesOrder.getPayTypeKey())){
+            billApplicationIInfoVoss.setIsCanEdit(true);
+        }else{
+            billApplicationIInfoVoss.setIsCanEdit(false);
+        }
+        //开票单位
+        if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+            ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingService.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+            if (invoicingDetailsVoResultBean.getData() != null) {
+                billApplicationIInfoVoss.setInvoicingUnit(invoicingDetailsVoResultBean.getData().getName());
+            }
+        }
+        List<VinListVos> vinListVos = new ArrayList<>();
+        List<FinBillTrailerVo> pcSelBillGcVos = new ArrayList<>();
+        for (int i = 0; i < vins.size(); i++) {
+            VinListVos vinListVos1 = new VinListVos();
+            vinListVos1 = baseMapper.selectByBus(contractId,vins.get(i));
+            //主车合格证照片
+            BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vins.get(i)).getData();
+            if (baseVehicleCertificateVo != null) {
+                List<String> clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData();
+                vinListVos1.setZcHgzImages(clhgeImages);
+            }
+            //挂车信息
+            TraliveredVo data = baseTrailerFeign.trailerList(vins.get(i), contractId).getData();
+            List<TrailerVo> list = data.getList();
+            if (list != null && list.size() > 0) {
+                for (TrailerVo trailerVo : list) {
+                    FinBillTrailerVo pcSelBillGcVo = new FinBillTrailerVo();
+                    pcSelBillGcVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                    pcSelBillGcVo.setVinNo(data.getVinNo());
+                    pcSelBillGcVos.add(pcSelBillGcVo);
+                }
+            }
+            vinListVos.add(vinListVos1);
+        }
+        billApplicationIInfoVoss.setVinList(vinListVos);
+        billApplicationIInfoVoss.setFinBillTrailers(pcSelBillGcVos);
+        return rb.success().setData(billApplicationIInfoVoss);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java

@@ -517,8 +517,6 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid());
         finCompanyInvoicingDetailsVo.setCreateBySid(crmCustomerTempVo.getCreateBySid());
         finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid());
-        finCompanyInvoicingDetailsVo.setOpenTickTypeKey(crmCustomerTempVo.getCustomerTypeKey());
-        finCompanyInvoicingDetailsVo.setOpenTickTypeValue(crmCustomerTempVo.getCustomerType());
         return rb.success().setData(finCompanyInvoicingDetailsVo);
     }
 

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

@@ -1,9 +1,13 @@
 package com.yxt.anrui.terminal.api.autoservice.invoiced;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class BillApplicationPageInfoQuery implements Query {
     private static final long serialVersionUID = -9141834631431139059L;
@@ -14,4 +18,8 @@ public class BillApplicationPageInfoQuery implements Query {
     private String userSid;
     @ApiModelProperty("组织全路径")
     private String orgPath;
+    @JsonProperty("contractNo")
+    private String contractId;
+
+    private List<String> vins = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java

@@ -20,7 +20,9 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdersVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@@ -186,6 +188,15 @@ public class InvoicedService {
         if (StringUtils.isBlank(query.getSid())) {
             String userSid = query.getUserSid();
             String orgPath = query.getOrgPath();
+            List<String> vins = query.getVins();
+            if(vins.size() == 0){
+                return rb.setMsg("请选择车辆");
+            }
+            ResultBean<BillApplicationIInfoVoss> billApplicationIInfoVoResultBean = finBillApplicationFeign.selectByContractNo(query.getContractId(),vins);
+            if(billApplicationIInfoVoResultBean.getData() != null){
+                BillApplicationIInfoVoss billApplicationIInfoVoss = billApplicationIInfoVoResultBean.getData();
+                BeanUtil.copyProperties(billApplicationIInfoVoss,vo);
+            }
             SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
             vo.setPublishInfo(sysOrganizationVo.getName() + "-" + sysUserVo.getName());
@@ -219,6 +230,9 @@ public class InvoicedService {
         vo.setContractId(finBillApplicationDetailsVo.getContractNo());
         vo.setDate(finBillApplicationDetailsVo.getApplyDate());
         vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid());
+        if("1".equals(finBillApplicationDetailsVo.getShowBtnStr())){
+            vo.setShowBtn(true);
+        }
         vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
         //根据合同查询销售订单
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();