Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionVo.java

@@ -72,4 +72,7 @@ public class BaseManufactorSubscriptionVo implements Vo {
 
     @ApiModelProperty("厂家采购类型value")
     private String applyType;
+
+    @ApiModelProperty(value = "排产申请sid")
+    private String vehApplySid;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/AppHandoverCertificateInfoVo.java

@@ -0,0 +1,23 @@
+package com.yxt.anrui.base.api.basevehiclecertificate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppHandoverCertificateInfoVo implements Vo {
+    private static final long serialVersionUID = 5182269192194137775L;
+
+    @ApiModelProperty("车架号")
+    private String vin;
+    @ApiModelProperty("车辆sid")
+    private String carSid;
+    @ApiModelProperty("")
+    private String invoice;
+    @ApiModelProperty("合格证日期")
+    private String date;
+    @ApiModelProperty("合格证附件")
+    private List<String> invoiceImages;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@@ -125,4 +125,9 @@ public interface BaseVehicleCertificateFeign {
     @PostMapping("/updateCertificate")
     @ResponseBody
     ResultBean updateCertificate(@RequestBody CertificateDto dto);
+
+    @ApiOperation("交车准备获取合格证信息")
+    @GetMapping("/getCertificateInfo/{vinNo}/{userSid}")
+    @ResponseBody
+    ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(@PathVariable("vinNo") String vinNo, @PathVariable("userSid") String userSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeignFallback.java

@@ -77,4 +77,9 @@ public class BaseVehicleCertificateFeignFallback implements BaseVehicleCertifica
         return null;
     }
 
+    @Override
+    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+        return null;
+    }
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.base.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author hp
+ * @Date 2022/11/17 15:10
+ * @Description 临时状态 持久状态
+ */
+public class VehicleStateTempOrLast {
+    @Getter
+    public static enum PaymentEnum {
+
+        ARREARS_CARRY_VEHICLE("0001", "欠款提车"),
+
+        ARREARS_INVOICING("0004", "欠款开票"),
+
+        PAY_MODELS("0002", "交清车款"),
+
+        BAG_CARD_BUSINESS("0003", "包牌业务");
+
+        /**
+         * code值
+         */
+        private final String code;
+        /**
+         * 备注
+         */
+        private final String remarks;
+
+        /**
+         * 构造器
+         *
+         * @param code    code值
+         * @param remarks 备注
+         */
+        private PaymentEnum(String code, String remarks) {
+            this.code = code;
+            this.remarks = remarks;
+        }
+    }
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -109,6 +109,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getDiscountTypeKey())) {//优惠类型key
                 qw.eq("discountTypeKey", pagerQuery.getDiscountTypeKey());
             }
+            qw.orderByDesc("createTime");
             String effectiveStartDate = pagerQuery.getGetEffectiveStartDate();
             String effectiveEndDate = pagerQuery.getGetEffectiveEndDate();
             qw.apply(StringUtils.isNotEmpty(effectiveStartDate), "date_format (effectiveDate,'%Y-%m-%d') >= date_format('" + effectiveStartDate + "','%Y-%m-%d')").

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml

@@ -5,8 +5,10 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo"
             resultType="com.yxt.anrui.base.api.basemanufactorsubscription.BaseManufactorSubscriptionVo">
-        SELECT *
-        FROM base_manufactor_subscription
+        SELECT bms.*,bva.sid as vehApplySid
+        FROM base_manufactor_subscription bms
+        LEFT JOIN bus_vehicle_apply bva
+        ON bms.proSchAppNo = bva.`applicationCode`
         <where>
             ${ew.sqlSegment}
         </where>
@@ -22,9 +24,9 @@
     </select>
 
     <update id="adopt">
-        update base_manufactor_subscription set subscriptionPeo  = #{subscriptionPeo}
-                                              , subscriptionDate = #{subscriptionDate}
-                                              , state            = 1
+        update base_manufactor_subscription set subscriptionPeo = #{subscriptionPeo}
+        , subscriptionDate = #{subscriptionDate}
+        , state = 1
         <if test="remarks != null and remarks != ''">
             , remarks=#{remarks}
         </if>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -110,25 +110,25 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         QueryWrapper<BaseManufactorSubscription> qw = new QueryWrapper<>();
 
         if (StringUtils.isNotBlank(query.getState())) {
-            qw.eq("state", query.getState());
+            qw.eq("bms.state", query.getState());
             if ("1".equals(query.getState())) {
                 //若为认款，则按照认款日期倒序排序
-                qw.orderByDesc("subscriptionDate");
+                qw.orderByDesc("bms.subscriptionDate");
             }
         }
         if (StringUtils.isNotBlank(query.getPaymentState())) {
-            qw.eq("paymentState", query.getPaymentState());
+            qw.eq("bms.paymentState", query.getPaymentState());
         }
         if (StringUtils.isNotBlank(query.getProSchAppNo())) {
-            qw.like("proSchAppNo", query.getProSchAppNo());
+            qw.like("bms.proSchAppNo", query.getProSchAppNo());
         }
         String subscriptionStartDate = query.getSubscriptionStartDate();
         String subscriptionEndDate = query.getSubscriptionEndDate();
-        qw.apply(StringUtils.isNotEmpty(subscriptionStartDate), "date_format (subscriptionDate,'%Y-%m-%d') >= date_format('" + subscriptionStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(subscriptionEndDate), "date_format (subscriptionDate,'%Y-%m-%d') <= date_format('" + subscriptionEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(subscriptionStartDate), "date_format (bms.subscriptionDate,'%Y-%m-%d') >= date_format('" + subscriptionStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(subscriptionEndDate), "date_format (bms.subscriptionDate,'%Y-%m-%d') <= date_format('" + subscriptionEndDate + "','%Y-%m-%d')"
                 );
-        qw.eq("createOrgSid", query.getCreateOrgSid());
-        qw.orderByDesc("proSchAppNo");
+        qw.eq("bms.createOrgSid", query.getCreateOrgSid());
+        qw.orderByDesc("bms.proSchAppNo");
         return qw;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@@ -297,6 +297,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
         return baseVehicleCertificateService.updateCertificate(dto);
     }
 
+    @Override
+    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+        return baseVehicleCertificateService.getCertificateInfo(vinNo, userSid);
+    }
+
     /**
      * @param sheet      单元格
      * @param resultCell 列表的值

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@@ -4,13 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.*;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
+import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
+import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,6 +37,15 @@ import java.util.List;
 @Service
 public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicleCertificateMapper, BaseVehicleCertificate> {
 
+    @Autowired
+    SysStaffOrgFeign sysStaffOrgFeign;
+
+    @Autowired
+    CommonAppendixService commonAppendixService;
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+
     /**
      * 台账信息条件分页查询
      *
@@ -190,4 +207,21 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
         int count = baseMapper.updateCertificate(dto);
         return rb.success();
     }
+
+    public ResultBean<AppHandoverCertificateInfoVo> getCertificateInfo(String vinNo, String userSid) {
+        ResultBean<AppHandoverCertificateInfoVo> rb = ResultBean.fireFail();
+        AppHandoverCertificateInfoVo vo = new AppHandoverCertificateInfoVo();
+        String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+        BaseVehicleCertificateVo baseVehicleCertificateVo = baseMapper.selectByVinNoAndOrgSid(vinNo, userOrgSid);
+        vo.setVin(vinNo);
+        vo.setDate(baseVehicleCertificateVo.getCertificateDate());
+        vo.setInvoice(baseVehicleCertificateVo.getCertificationNo());
+        List<CommonAppendixVo> appAppendixList = commonAppendixService.getAppAppendixList(baseVehicleCertificateVo.getSid(), "0002");
+        List<String> invoiceImages = new ArrayList<>();
+        for (CommonAppendixVo commonAppendixVo : appAppendixList) {
+            invoiceImages.add(fileUploadComponent.getUrlPrefix() + commonAppendixVo.getFilePath());
+        }
+        vo.setInvoiceImages(invoiceImages);
+        return rb;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoiceInfoVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,7 +27,7 @@ public class AppAdvanceInvoiceInfoVo implements Vo {
     @ApiModelProperty("所有车辆列表")
     private List<AdCarListVo> vinList = new ArrayList<>();
     @ApiModelProperty("欠款金额")
-    private String arrearsMoney;
+    private BigDecimal arrearsMoney;
     @ApiModelProperty("车型")
     private String carModel;
     @ApiModelProperty("开票信息确认书")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/AppAdvanceInvoicePageQuery.java

@@ -13,4 +13,7 @@ public class AppAdvanceInvoicePageQuery implements Query {
 
     @ApiModelProperty("客户名称字段 合同编号字段")
     private String name;
+
+    @ApiModelProperty("状态")
+    private String type;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busadvanceginvoiceapply/BusAdvanceGinvoiceapply.java

@@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui_buscenter(销售业务) <br/>
  * File: BusAdvanceGinvoiceapply.java <br/>
@@ -49,27 +51,27 @@ import lombok.Data;
 @TableName("bus_advance_ginvoiceapply")
 public class BusAdvanceGinvoiceapply extends BaseEntity {
     private static final long serialVersionUID = 1L;
-	@ApiModelProperty("创建人接口")
+    @ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("数量")
+    @ApiModelProperty("数量")
     private Integer num; // 数量
-	@ApiModelProperty("欠款金额")
-    private Float arrearsMoney; // 欠款金额
-	@ApiModelProperty("承诺回款日期")
+    @ApiModelProperty("欠款金额")
+    private BigDecimal arrearsMoney; // 欠款金额
+    @ApiModelProperty("承诺回款日期")
     private String returnedMoneyDate; // 承诺回款日期
-	@ApiModelProperty("申请人")
+    @ApiModelProperty("申请人")
     private String applyName; // 申请人
-	@ApiModelProperty("车型")
+    @ApiModelProperty("车型")
     private String carModel; // 车型
-	@ApiModelProperty("申请日期")
+    @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("提前开票原因key")
+    @ApiModelProperty("提前开票原因key")
     private String advGinReasonKey; // 提前开票原因key
-	@ApiModelProperty("提前开票原因value")
+    @ApiModelProperty("提前开票原因value")
     private String advGinReasonValue; // 提前开票原因value
     @ApiModelProperty("选择 手写  key  0 1")
     private String advGinReasonType;
@@ -83,6 +85,9 @@ public class BusAdvanceGinvoiceapply extends BaseEntity {
     @ApiModelProperty(value = "用户sid")
     private String createBySid;
 
+    @ApiModelProperty(value = "状态")
+    private String type;
+
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
     @ApiModelProperty(value = "节点id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryVehicleQuery.java

@@ -14,4 +14,7 @@ public class AppArrearsCarryVehicleQuery implements Query {
     @ApiModelProperty("客户名称 合同编号")
     private String name;
 
+    @ApiModelProperty("状态")
+    private String type;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApply.java

@@ -70,6 +70,9 @@ public class BusArrearsCarryVehicleApply extends BaseEntity {
     @ApiModelProperty("分公司名称")
     private String useOrgName;
 
+    @ApiModelProperty("状态")
+    private String type;
+
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
     @ApiModelProperty(value = "节点id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -98,7 +98,7 @@ public interface BusArrearsCarryVehicleApplyFeign {
     public ResultBean saveArrearsApply(@Valid @RequestBody AppArrearsCarryDto dto);
 
     @ApiOperation("手机端-删除欠款提车")
-    @GetMapping("/deleteArrearsTakeCar")
+    @DeleteMapping("/deleteArrearsTakeCar")
     @ResponseBody
     public ResultBean deleteArrearsTakeCar(@SpringQueryMap AppAdvanceArrearsInfoQuery query);
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscenterfile/BuscenterFileEnum.java

@@ -16,6 +16,9 @@ public enum BuscenterFileEnum {
     ENTRUST("007", "委托提车授权书"),
     ENTRUST_CONFIRM("008", "交车资料确认单"),
     EXIT_TICKET("009", "出门证"),
+    HANDOVER_POLICY("010", "保单照片"),
+    HANDOVER_LICENCE("011", "临时牌照"),
+    HANDOVER_OTHRRDATA("012", "其他资料"),
     ;
 
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepare.java

@@ -54,6 +54,8 @@ public class BusHandoverPrepare extends BaseEntity {
     private String contractNo; // 合同编号
 	@ApiModelProperty("客户名称")
     private String customerName; // 客户名称
+    @ApiModelProperty("客户sid")
+    private String customerSid;
 	@ApiModelProperty("联系电话")
     private String mobile; // 联系电话
 	@ApiModelProperty("品牌")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareAddDto.java

@@ -13,6 +13,8 @@ public class BusHandoverPrepareAddDto implements Dto {
 
     @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
+    @ApiModelProperty("客户Sid")
+    private String customerSid; // 客户名称
     @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
     @ApiModelProperty("联系电话")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeign.java

@@ -140,5 +140,9 @@ public interface BusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(@SpringQueryMap AppBusHandoverPrepareInfoQuery query);
 
+    @ApiOperation("提交交车准备信息")
+    @PostMapping("/submitDeliveryPlanInfo")
+    @ResponseBody
+    ResultBean submitDeliveryPlanInfo(@RequestBody AppSubmitHandoverPrepareDto dto);
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/BusHandoverPrepareFeignFallback.java

@@ -128,4 +128,9 @@ public class BusHandoverPrepareFeignFallback implements BusHandoverPrepareFeign
 	public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoQuery.java

@@ -11,6 +11,8 @@ public class AppCertificateInfoQuery implements Query {
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    private String sid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppCertificateInfoVo.java

@@ -10,10 +10,10 @@ import java.util.List;
 public class AppCertificateInfoVo implements Vo {
     private static final long serialVersionUID = -4673876588141577559L;
 
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
     @ApiModelProperty("")
     private String invoice;
     @ApiModelProperty("合格证日期")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoQuery.java

@@ -11,7 +11,6 @@ public class AppInvoicingInfoQuery implements Query {
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+    private String sid;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppInvoicingInfoVo.java

@@ -10,10 +10,10 @@ import java.util.List;
 public class AppInvoicingInfoVo implements Vo {
     private static final long serialVersionUID = 8827030575604891015L;
 
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
     @ApiModelProperty("发票代码")
     private String invoice;
     @ApiModelProperty("开票日期")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataDto.java

@@ -11,10 +11,8 @@ public class AppOtherDataDto implements Dto {
 
     private static final long serialVersionUID = 6765583840451569166L;
 
-    @ApiModelProperty("")
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("其他资料照片")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoQuery.java

@@ -8,10 +8,9 @@ import lombok.Data;
 public class AppOtherDataInfoQuery implements Query {
     private static final long serialVersionUID = 6544083379297436705L;
 
-    @ApiModelProperty("")
+
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppOtherDataInfoVo.java

@@ -10,10 +10,8 @@ import java.util.List;
 public class AppOtherDataInfoVo implements Vo {
     private static final long serialVersionUID = 7178241214019642737L;
 
-    @ApiModelProperty("")
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("其他资料照片")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyDto.java

@@ -14,10 +14,9 @@ public class AppPolicyDto implements Dto {
     private List<String> policyList;
     @ApiModelProperty("临时牌照")
     private List<String> licenceList;
-    @ApiModelProperty("sid")
+
     private String sid;
-    @ApiModelProperty("车辆照片")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoQuery.java

@@ -13,7 +13,4 @@ public class AppPolicyInfoQuery implements Query {
 
     @ApiModelProperty("车架号")
     private String vin;
-
-    @ApiModelProperty("车辆sid")
-    private String carSid;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppPolicyInfoVo.java

@@ -1,4 +1,20 @@
 package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
 
-public class AppPolicyInfoVo {
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppPolicyInfoVo implements Vo {
+    private static final long serialVersionUID = 5449450307167004770L;
+    private String sid;
+
+    @ApiModelProperty("保单照片")
+    private List<String> policyList;
+    @ApiModelProperty("临时牌照")
+    private List<String> licenceList;
+    @ApiModelProperty("车架号")
+    private String vin;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverprepare/app/AppSubmitHandoverPrepareDto.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.bushandoverprepare.app;
+
+import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppSubmitHandoverPrepareDto implements Dto {
+    private static final long serialVersionUID = 138156532304986357L;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("车辆集合")
+    private List<AppBusHandoverPrepareVehicleDto> carDataList;
+    @ApiModelProperty("记录sid")
+    private String sid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构")
+    private String orgPath;
+    @ApiModelProperty("付款方式")
+    private String payType;
+    @ApiModelProperty("车型")
+    private String model;
+    @ApiModelProperty("品牌")
+    private String brand;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleDto.java

@@ -13,15 +13,15 @@ public class AppBusHandoverPrepareVehicleDto implements Dto {
     @ApiModelProperty("车架号")
     private String vinNo; // 车架号
     @ApiModelProperty("开票状态")
-    private int invoicingState; // 开票状态
+    private boolean invoicingState; // 开票状态
     @ApiModelProperty("合格证状态")
-    private int certificateState; // 合格证状态
+    private boolean certificateState; // 合格证状态
     @ApiModelProperty("保单状态")
-    private int policyState; // 保单状态
+    private boolean policyState; // 保单状态
     @ApiModelProperty("随车资料状态")
-    private int onBoardDataState; // 随车资料状态
+    private boolean onBoardDataState; // 随车资料状态
     @ApiModelProperty("其他资料状态")
-    private int otherDataState; // 其他资料状态
+    private boolean otherDataState; // 其他资料状态
     @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
     @ApiModelProperty("创建组织名称")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverpreparevehicle/AppBusHandoverPrepareVehicleInfoVo.java

@@ -8,6 +8,8 @@ import lombok.Data;
 public class AppBusHandoverPrepareVehicleInfoVo implements Vo {
     private static final long serialVersionUID = 1415137296013613928L;
 
+    @ApiModelProperty("sid")
+    private String sid; // 交车申请表sid
     @ApiModelProperty("交车申请表sid")
     private String mainSid; // 交车申请表sid
     @ApiModelProperty("车架号")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWait.java

@@ -39,6 +39,12 @@ public class BusHandoverWait extends BaseEntity {
     @ApiModelProperty("付款状态value")
     private String payStateValue;
 
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+
+    @ApiModelProperty("车型别名")
+    private String modelName;
+
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandoverwait/BusHandoverWaitDto.java

@@ -45,4 +45,7 @@ public class BusHandoverWaitDto implements Dto {
     @ApiModelProperty("车型别名")
     private String modelName;
 
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/contract/AppRovalContractPageQuery.java

@@ -14,4 +14,7 @@ public class AppRovalContractPageQuery implements Query {
 
     @ApiModelProperty("车架号 客户名称 合同编号")
     private String name;
+
+    @ApiModelProperty("状态")
+    private int stateType;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyMapper.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 import java.util.Map;
@@ -69,4 +70,7 @@ public interface BusAdvanceGinvoiceapplyMapper extends BaseMapper<BusAdvanceGinv
     IPage<AppAdvanceInvoicePageVo> getAdvanceInvoiceList(IPage<AppAdvanceInvoicePageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppAdvanceInvoicePageQuery> qw, @Param("name") String name);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    @Update("update bus_advance_ginvoiceapply set `type` = '2' where sid =#{sid}")
+    void updateType(@Param("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java

@@ -30,16 +30,20 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.*;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.*;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppAdvanceInvoiceTaskQuery;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppSubmitAdvanceInvoiceDto;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeQuery;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.GetNodeVo;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicle;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDto;
@@ -81,6 +85,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -133,6 +138,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
     private CrmCustomerTempFeign crmCustomerTempFeign;
     @Autowired
     private FinBillApplicationFeign finBillApplicationFeign;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     public PagerVo<BusAdvanceGinvoiceapply> listPage(PagerQuery<BusAdvanceGinvoiceapplyQuery> pq) {
         BusAdvanceGinvoiceapplyQuery query = pq.getParams();
@@ -385,6 +392,9 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         if (StringUtils.isNotBlank(params.getUserSid())) {
             qw.eq("createBySid", params.getUserSid());
         }
+        if (StringUtils.isNotBlank(params.getType())) {
+            qw.eq("type", params.getType());
+        }
         IPage<AppAdvanceInvoicePageQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppAdvanceInvoicePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
         for (AppAdvanceInvoicePageVo record : iPage.getRecords()) {
@@ -408,18 +418,14 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         vo.setContractSid(contractSid);
         List<AdCarListVo> carList = new ArrayList<>();
         List<AdCarListVo> vinList = new ArrayList<>();
-        int arrearsMoney = 0;
         List<BusGinvoiceapplyVehicleDetailsVo> carLists = busGinvoiceapplyVehicleService.fetchByAdvGinSid(contractSid);
         for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : carLists) {
             AdCarListVo adCarListVo = new AdCarListVo();
             adCarListVo.setPrice(vehicleDetailsVo.getDealMoney());
             adCarListVo.setVin(vehicleDetailsVo.getVinNo());
             carList.add(adCarListVo);
-            int dealMoney = Integer.parseInt(vehicleDetailsVo.getDealMoney());
-            arrearsMoney = dealMoney + arrearsMoney;
         }
         vo.setCarList(carList);
-        vo.setArrearsMoney(String.valueOf(arrearsMoney));
         List<AppRovalContractPageVo> vinLists = busSalesOrderService.selectByContractNo(busAdvanceGinvoiceapply.getContractNo());
         if (vinLists.size() > 0) {
             for (AppRovalContractPageVo appRovalContractPageVo : vinLists) {
@@ -482,6 +488,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         busAdvanceGinvoiceapply.setApplyName(sysUserVo.getName());
         busAdvanceGinvoiceapply.setApplyDate(sf.format(new Date()));
         busAdvanceGinvoiceapply.setUseOrgName(sysOrganizationVo.getName());
+        BigDecimal arrearsMoney = new BigDecimal(0);
         if (dto.getVinList().size() > 0) {
             for (String vin : dto.getVinList()) {
                 BusGinvoiceapplyVehicle busGinvoiceapplyVehicle = new BusGinvoiceapplyVehicle();
@@ -492,11 +499,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                     busGinvoiceapplyVehicle.setVehicleSid(baseVehicle.getSid());
                 }
                 busGinvoiceapplyVehicle.setDealMoney(price);
+
+                BigDecimal dealMoney = new BigDecimal(busGinvoiceapplyVehicle.getDealMoney());
+                arrearsMoney = dealMoney.add(arrearsMoney);
                 busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
             }
         }
+        busAdvanceGinvoiceapply.setArrearsMoney(arrearsMoney);
         busAdvanceGinvoiceapply.setNum(dto.getVinList().size());
         busAdvanceGinvoiceapply.setCarModel(modelName);
+        busAdvanceGinvoiceapply.setType("1");
         save(busAdvanceGinvoiceapply);
         return rb.success().setData(busAdvanceGinvoiceapply.getSid());
     }
@@ -507,7 +519,6 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
         BusAdvanceGinvoiceapply busAdvanceGinvoiceapply = fetchBySid(dto.getContractSid());
         BeanUtil.copyProperties(dto, busAdvanceGinvoiceapply);
-        updateById(busAdvanceGinvoiceapply);
         String sid = dto.getContractSid();
         busGinvoiceapplyVehicleService.delByAdvGinSid(sid);
         List<AdCarListDto> carList = dto.getCarList();
@@ -522,6 +533,8 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
             busGinvoiceapplyVehicle.setDealMoney(adCarListDto.getPrice());
             busGinvoiceapplyVehicleService.save(busGinvoiceapplyVehicle);
         }
+        busAdvanceGinvoiceapply.setNum(carList.size());
+        updateById(busAdvanceGinvoiceapply);
         commonAppendixFeign.deleteFiles(dto.getContractSid());
         saveFile(dto.getConfirmFile(), dto.getApplyFile(), dto.getRegisterFile(), busAdvanceGinvoiceapply.getSid(), sysUserVo.getStaffSid());
         return rb.success().setData(busAdvanceGinvoiceapply.getSid());
@@ -597,6 +610,16 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+        //修改状态
+        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+        baseVehicleTempstateDto.setBusSid(businessSid);
+        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode());
+        List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid());
+        for (BusGinvoiceapplyVehicleDetailsVo busGinvoiceapplyVehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
+            baseVehicleTempstateDto.setVehSid(busGinvoiceapplyVehicleDetailsVo.getVehicleSid());
+            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+        }
+        baseMapper.updateType(busAdvanceGinvoiceapply.getSid());
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -74,4 +74,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
      * @return
      */
     int updateFlowFiled(Map<String, Object> map);
+
+    void updateType(@Param("businessSid") String businessSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -98,4 +98,10 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <update id="updateType">
+        update bus_arrears_carry_vehicle_apply
+        set `type` = '2'
+        where sid = #{businessSid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceInfoVo;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto;
@@ -23,6 +26,7 @@ import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarry
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busdelivered.AddRetrievalApplyDto;
 import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.biz.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsService;
 import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
@@ -30,6 +34,8 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.flow.FlowableService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -129,6 +135,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
     @Autowired
     private BusDeliveredService busDeliveredService;
 
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
+
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
+
     /**
      * 欠款提车分页列表查询条件
      *
@@ -452,6 +464,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         if (StringUtils.isNotBlank(params.getUserSid())) {
             qw.eq("createBySid", params.getUserSid());
         }
+        if (StringUtils.isNotBlank(params.getType())) {
+            qw.eq("type", params.getType());
+        }
         IPage<AppArrearsCarryVehicleQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppArrearsCarryVehiclePageVo> iPage = baseMapper.getAdvanceInvoiceList(page, qw, params.getName());
         return iPage;
@@ -554,8 +569,12 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         busArrearsCarryVehicleApply.setCustomerName(customerName);// 客户名称
         busArrearsCarryVehicleApply.setContractNo(contractNo);// 合同编号
         busArrearsCarryVehicleApply.setContractMoney(new BigDecimal(contractAmount));//合同总金额
-//        busArrearsCarryVehicleApply.setContractCollectionMoney(new BigDecimal());//合同收款金额
-//        busArrearsCarryVehicleApply.setArrearsMoney();//欠款金额
+        busArrearsCarryVehicleApply.setType("1");
+        AppBusArrearsCarryMoneyVo appBusArrearsCarryMoneyVo = finCollectionConfirmationFeign.selectArrearsMoneyOrCollectionMoney(contractNo).getData();
+        if (appBusArrearsCarryMoneyVo != null) {
+            busArrearsCarryVehicleApply.setContractCollectionMoney(appBusArrearsCarryMoneyVo.getContractCollectionMoney());//合同收款金额
+            busArrearsCarryVehicleApply.setArrearsMoney(appBusArrearsCarryMoneyVo.getArrearsMoney());//欠款金额
+        }
         // 添加欠款提车 车辆表数据
         if (dto.getVinList().size() > 0) {
             List<String> vinList = dto.getVinList();
@@ -645,6 +664,16 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             return rb.setMsg(resultBean.getMsg());
         }
         String businessSid = resultBean.getData();
+
+        BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
+        baseVehicleTempstateDto.setBusSid(businessSid);
+        baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
+        List<BusArrearsCarryVehicleDetailsVo> busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
+        for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) {
+            baseVehicleTempstateDto.setVehSid(busArrearsCarryVehicleDetailsVo.getVehicleSid());
+            baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
+        }
+        baseMapper.updateType(businessSid);
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -770,6 +799,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
                 List<String> recipientSidList = new ArrayList<>();
 
+                //修改状态
+                baseMapper.updateType(bv.getBusinessSid());
+
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -780,10 +812,15 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         if (baseVehicleSelectVo != null) {
                             addRetrievalApplyDto.setModelName(baseVehicleSelectVo.getModelName());
                         }
-
                         addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney()));
                         addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo());
                         addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName());
+
+                        BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getByContractNo(busArrearsCarryVehicleApply.getContractNo());
+                        addRetrievalApplyDto.setPaymentMethod(busSalesOrderDetailsVo.getPayType());// 付款方式
+                        addRetrievalApplyDto.setPaymentMethodKey(busSalesOrderDetailsVo.getPayTypeKey());// 付款方式
+                        addRetrievalApplyDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); // 款项状态
+                        addRetrievalApplyDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());// 款项状态
                         busDeliveredService.addRetrievalApply(addRetrievalApplyDto);
                     }
                 }
@@ -899,6 +936,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid());
                 List<String> recipientSidList = new ArrayList<>();
 
+                //修改状态
+                baseMapper.updateType(bv.getBusinessSid());
+
                 //推送出库申请
                 List<BusArrearsCarryVehicleDetailsVo> vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid());
                 if (vehicleDetailsVos.size() > 0) {
@@ -909,6 +949,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         if (baseVehicleSelectVo != null) {
                             addRetrievalApplyDto.setModelName(baseVehicleSelectVo.getModelName());
                         }
+                        BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getByContractNo(busArrearsCarryVehicleApply.getContractNo());
+                        addRetrievalApplyDto.setPaymentMethod(busSalesOrderDetailsVo.getPayType());// 付款方式
+                        addRetrievalApplyDto.setPaymentMethodKey(busSalesOrderDetailsVo.getPayTypeKey());// 付款方式
+                        addRetrievalApplyDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); // 款项状态
+                        addRetrievalApplyDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());// 款项状态
                         addRetrievalApplyDto.setPrice(String.valueOf(vehicleDetailsVo.getDealMoney()));
                         addRetrievalApplyDto.setContractNo(busArrearsCarryVehicleApply.getContractNo());
                         addRetrievalApplyDto.setName(busArrearsCarryVehicleApply.getCustomerName());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileMapper.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.buscenter.biz.buscenterfile;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,9 +15,12 @@ import java.util.List;
  */
 @Mapper
 public interface BuscenterFileMapper extends BaseMapper<BuscenterFile> {
-    List<BuscenterFile> selectByLinkSid(@Param("sid") String sid, @Param("attachType")String attachType);
+    List<BuscenterFile> selectByLinkSid(@Param("sid") String sid, @Param("attachType") String attachType);
 
     int deleteByLinkSid(String sid);
 
     BuscenterFile selectByLinkSidOne(@Param("sid") String sid, @Param("attachType") String attachType);
+
+    @Delete("delete from buscenter_file where linkSid = #{sid} and attachType = #{attachType}")
+    void delByLinkSidOrType(@Param("sid") String sid, @Param("attachType") String attachType);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java

@@ -48,4 +48,8 @@ public class BuscenterFileService extends MybatisBaseService<BuscenterFileMapper
     public BuscenterFile selectByLinkSidOne(String sid, String attachType) {
         return baseMapper.selectByLinkSidOne(sid, attachType);
     }
+
+    public void delByLinkSidOrType(String sid, String attachType) {
+        baseMapper.delByLinkSidOrType(sid,attachType);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareRest.java

@@ -158,4 +158,9 @@ public class BusHandoverPrepareRest implements BusHandoverPrepareFeign {
     public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
         return busHandoverPrepareService.getDeliveryPlanInfoDetail(query);
     }
+
+    @Override
+    public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
+        return busHandoverPrepareService.submitDeliveryPlanInfo(dto);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -28,15 +28,27 @@ package com.yxt.anrui.buscenter.biz.bushandoverprepare;
 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.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
+import com.yxt.anrui.base.api.basevehiclecertificate.AppHandoverCertificateInfoVo;
+import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile;
+import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFileEnum;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.*;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.app.*;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.BusHandoverPrepareVehicle;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitDto;
+import com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitFeign;
+import com.yxt.anrui.buscenter.biz.buscenterfile.BuscenterFileService;
 import com.yxt.anrui.buscenter.biz.bushandoverpreparevehicle.BusHandoverPrepareVehicleService;
+import com.yxt.anrui.buscenter.biz.bushandoverwait.BusHandoverWaitService;
 import com.yxt.anrui.fin.api.finbillvehicle.AppInvoicingInfoVinNoVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -47,6 +59,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -70,6 +83,16 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private FinBillVehicleFeign finBillVehicleFeign;
+    @Autowired
+    BaseVehicleCertificateFeign baseVehicleCertificateFeign;
+    @Autowired
+    BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BuscenterFileService buscenterFile;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private BusHandoverWaitService busHandoverWaitService;
 
     private QueryWrapper<BusHandoverPrepare> createQueryWrapper(BusHandoverPrepareQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -182,27 +205,70 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
         ResultBean<AppInvoicingInfoVinNoVo> resultBean = finBillVehicleFeign.selDetailsByVinNo(vin);
         AppInvoicingInfoVinNoVo data = resultBean.getData();
         BeanUtil.copyProperties(data, vo);
+        vo.setVin(vin);
         return rb.success().setData(vo);
     }
 
     public ResultBean<AppCertificateInfoVo> getCertificateInfo(AppCertificateInfoQuery query) {
-        return null;
+        ResultBean<AppCertificateInfoVo> rb = new ResultBean();
+        AppCertificateInfoVo vo = new AppCertificateInfoVo();
+        String vinNo = query.getVin();
+        String userSid = query.getUserSid();
+        ResultBean<AppHandoverCertificateInfoVo> resultBean = baseVehicleCertificateFeign.getCertificateInfo(vinNo, userSid);
+        AppHandoverCertificateInfoVo data = resultBean.getData();
+        BeanUtil.copyProperties(data, vo);
+        vo.setVin(vinNo);
+        return rb.success().setData(vo);
     }
 
     public ResultBean<AppPolicyInfoVo> getPolicyInfo(AppPolicyInfoQuery query) {
-        return null;
+        ResultBean<AppPolicyInfoVo> rb = new ResultBean<>();
+        AppPolicyInfoVo vo = new AppPolicyInfoVo();
+        List<String> policyList = new ArrayList<>();// 保单照片
+        List<String> licenceList = new ArrayList<>();// 临时牌照
+        List<BuscenterFile> policyFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        for (BuscenterFile file : policyFiles) {
+            policyList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+        }
+        List<BuscenterFile> licenceFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        for (BuscenterFile file : licenceFiles) {
+            licenceList.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+        }
+        vo.setPolicyList(policyList);
+        vo.setLicenceList(licenceList);
+        vo.setSid(query.getSid());
+        vo.setVin(query.getVin());
+        return rb.success().setData(vo);
     }
 
     public ResultBean savePolicyInfo(AppPolicyDto dto) {
-        return null;
+        ResultBean rb = new ResultBean<>();
+        buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        buscenterFile.saveAll(dto.getSid(), dto.getPolicyList(), BuscenterFileEnum.HANDOVER_POLICY.getAttachType());
+        buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        buscenterFile.saveAll(dto.getSid(), dto.getLicenceList(), BuscenterFileEnum.HANDOVER_LICENCE.getAttachType());
+        return rb.success();
     }
 
     public ResultBean<AppOtherDataInfoVo> getOtherDataInfo(AppOtherDataInfoQuery query) {
-        return null;
+        ResultBean<AppOtherDataInfoVo> rb = new ResultBean<>();
+        AppOtherDataInfoVo vo = new AppOtherDataInfoVo();
+        List<BuscenterFile> otherFiles = buscenterFile.selectByLinkSid(query.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        List<String> otherInfo = new ArrayList<>();
+        for (BuscenterFile file : otherFiles) {
+            otherInfo.add(fileUploadComponent.getUrlPrefix() + file.getFilePath());
+        }
+        vo.setOtherInfo(otherInfo);
+        vo.setSid(query.getSid());
+        vo.setVin(query.getVin());
+        return rb.success().setData(vo);
     }
 
     public ResultBean saveOtherDataInfo(AppOtherDataDto dto) {
-        return null;
+        ResultBean rb = new ResultBean<>();
+        buscenterFile.delByLinkSidOrType(dto.getSid(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        buscenterFile.saveAll(dto.getSid(), dto.getOtherInfo(), BuscenterFileEnum.HANDOVER_OTHRRDATA.getAttachType());
+        return rb.success();
     }
 
     public ResultBean saveDeliveryPlanInfo(AppHandoverPrepareDto dto) {
@@ -225,6 +291,51 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
     }
 
     public ResultBean<AppBusHandoverPrepareInfoVo> getDeliveryPlanInfoDetail(AppBusHandoverPrepareInfoQuery query) {
-        return null;
+        ResultBean<AppBusHandoverPrepareInfoVo> rb = ResultBean.fireFail();
+        String sid = query.getSid();
+        AppBusHandoverPrepareInfoVo appBusHandoverPrepareInfoVo = new AppBusHandoverPrepareInfoVo();
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(sid);
+        BeanUtil.copyProperties(busHandoverPrepare, appBusHandoverPrepareInfoVo);
+        List<AppBusHandoverPrepareVehicleInfoVo> list = busHandoverPrepareVehicleService.selByMainSid(sid);
+        appBusHandoverPrepareInfoVo.setCarDataList(list);
+        appBusHandoverPrepareInfoVo.setUserSid(query.getUserSid());
+        return rb.success().setData(appBusHandoverPrepareInfoVo);
+    }
+
+    public ResultBean submitDeliveryPlanInfo(AppSubmitHandoverPrepareDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        BusHandoverPrepare busHandoverPrepare = fetchBySid(dto.getSid());
+        BeanUtil.copyProperties(dto, busHandoverPrepare);
+        List<AppBusHandoverPrepareVehicleDto> handoverPrepareVehicleDtos = dto.getCarDataList();
+        if (handoverPrepareVehicleDtos.size() > 0) {
+            String sid = dto.getSid();
+            busHandoverPrepareVehicleService.deleteByMainSid(sid);
+            for (AppBusHandoverPrepareVehicleDto handoverPrepareVehicleDto : handoverPrepareVehicleDtos) {
+                BusHandoverPrepareVehicle busHandoverPrepareVehicle = new BusHandoverPrepareVehicle();
+                BeanUtil.copyProperties(handoverPrepareVehicleDto, busHandoverPrepareVehicle);
+                busHandoverPrepareVehicle.setMainSid(busHandoverPrepare.getSid());
+                busHandoverPrepareVehicleService.save(busHandoverPrepareVehicle);
+
+                BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto();
+                busHandoverWaitDto.setContractNo(busHandoverPrepare.getContractNo());
+                busHandoverWaitDto.setCustomerName(busHandoverPrepare.getCustomerName());
+                busHandoverWaitDto.setCustomerSid(busHandoverPrepare.getCustomerSid());
+                busHandoverWaitDto.setVinNo(handoverPrepareVehicleDto.getVinNo());
+                BaseVehicle data = baseVehicleFeign.selectByVinNoAndOrgSid(handoverPrepareVehicleDto.getVinNo(), busHandoverPrepare.getUseOrgSid()).getData();
+                if (data!=null){
+                    busHandoverWaitDto.setVinSid(data.getSid());
+                    busHandoverWaitDto.setModelSid(data.getModelSid());
+                    busHandoverWaitDto.setModelName(data.getModelName());
+                }
+                busHandoverWaitDto.setUseOrgSid(busHandoverPrepare.getUseOrgSid());
+                busHandoverWaitDto.setPayTypeKey(busHandoverPrepare.getPayTypeKey());
+                busHandoverWaitDto.setPayTypeValue(busHandoverPrepare.getPayType());
+                busHandoverWaitService.saveAll(busHandoverWaitDto);
+            }
+        }
+        busHandoverPrepare.setHandoverPrepareState("已准备");
+        busHandoverPrepare.setHandoverPrepareStateKey("2");
+        updateById(busHandoverPrepare);
+        return rb.success();
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.java

@@ -67,19 +67,19 @@ public interface BusHandoverPrepareVehicleMapper extends BaseMapper<BusHandoverP
     List<AppBusHandoverPrepareVehicleInfoVo> selByMainSid(@Param("sid") String sid);
 
 
-    @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where mainSid = #{sid} and vinNo = #{vin}")
+    @Update("update bus_handover_prepare_vehicle set invoicingState = 1 where sid = #{sid} and vinNo = #{vin}")
     void saveInvoiceState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set  certificateState = 1 where mainSid = #{sid} and vinNo = #{vin} ")
+    @Update("update bus_handover_prepare_vehicle set  certificateState = 1 where sid = #{sid} and vinNo = #{vin} ")
     void saveCertificateState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set policyState = 1 where mainSid = #{sid} and vinNo = #{vin}  ")
+    @Update("update bus_handover_prepare_vehicle set policyState = 1 where sid = #{sid} and vinNo = #{vin}  ")
     void savePolicyState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set  onBoardDataState = 1 where mainSid = #{sid} and vinNo = #{vin} ")
+    @Update("update bus_handover_prepare_vehicle set  onBoardDataState = 1 where sid = #{sid} and vinNo = #{vin} ")
     void saveOnBoardState(@Param("sid") String sid, @Param("vin") String vin);
 
-    @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where mainSid = #{sid} and vinNo = #{vin}  ")
+    @Update("update bus_handover_prepare_vehicle set otherDataState = 1 where sid = #{sid} and vinNo = #{vin}  ")
     void saveOtherDataState(@Param("sid") String sid, @Param("vin") String vin);
 
     @Delete("delete from bus_handover_prepare_vehicle where mainSid = #{sid}")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml

@@ -16,7 +16,8 @@
     </select>
     <select id="selByMainSid"
             resultType="com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo">
-        select mainSid,
+        select sid,
+               mainSid,
                vinNo,
                invoicingState   as invoicingStateb,
                certificateState as certificateStateb,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.java

@@ -134,7 +134,7 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
 
     int updateByNodeState(@Param("nodeState") String nodeState, @Param("businessSid") String businessSid);
 
-    IPage<AppBusMainDepositOrderVo> pageAppList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw, @Param("name") String name);
+    IPage<AppBusMainDepositOrderVo> pageAppList(IPage<BusMainDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusMainDeposit> qw, @Param("names") String names);
 
     String selectNum(String bill);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -57,10 +57,11 @@
                 , #{name}
                 , '%')
             </if>
-        </where> order by bmd.id desc ) a
+        </where>
+        order by bmd.id desc ) a
         <if test="name != '' and name != null">
             UNION ALL
-           select * from( SELECT
+            select * from( SELECT
             bmd.sid AS virtualOrderSid,
             bmd.billNo AS virtualOrderId,
             bmd.createDate AS virtualOrderDate,
@@ -80,7 +81,8 @@
                     , #{name}
                     , '%')
                 </if>
-            </where> order by bmd.id desc ) b
+            </where>
+            order by bmd.id desc ) b
             UNION ALL
             select * from( SELECT
             bmd.sid AS virtualOrderSid,
@@ -102,7 +104,8 @@
                     , #{name}
                     , '%')
                 </if>
-            </where> order by bmd.id desc ) c
+            </where>
+            order by bmd.id desc ) c
         </if>
     </select>
 
@@ -308,11 +311,14 @@
         left join bus_deposit_vehicle_customer bc on bd.sid = bc.billSid
         <where>
             ${ew.sqlSegment}
-            <if test="name != null and name != ''">
-                and concat(bd.billNo
-                , bc.customerName
-                , bc.customerMobile) LIKE concat('%'
-                , #{name}
+            <if test="names != null and names != ''">
+                and concat(IFNULL(bd.billNo
+                , '')
+                , ifnull(bc.customerName
+                , '')
+                , ifnull(bc.customerMobile
+                , '')) LIKE concat('%'
+                , #{names}
                 , '%')
             </if>
         </where>
@@ -344,6 +350,8 @@
     </select>
 
     <update id="updateModify">
-        update bus_main_deposit set modifyTime = #{date} where sid = #{sid}
+        update bus_main_deposit
+        set modifyTime = #{date}
+        where sid = #{sid}
     </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -178,4 +178,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     IPage<AppRovalContractPageVo> getApprovalContractList(IPage<AppRovalContractPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppRovalContractPageVo> qw, @Param("name") String name);
 
     List<AppRovalContractPageVo> selectByContractNo(@Param("contractNo") String contractNo);
+
+
+    BusSalesOrderDetailsVo getByContractNo(String contractNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -263,4 +263,9 @@
                  LEFT JOIN bus_sales_order_vehicle bsov ON bsov.salesOrderSid = bo.sid
         WHERE bo.contractNo = #{contractNo}
     </select>
+    <select id="getByContractNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo">
+        SELECT *
+        FROM bus_sales_order bo
+        WHERE bo.contractNo = #{contractNo}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -42,6 +42,8 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign;
 import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
+import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
@@ -53,6 +55,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
@@ -232,6 +235,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BusDepositService busDepositService;
     @Autowired
     private BusDepositVehicleService busDepositVehicleService;
+    @Autowired
+    private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
 
     /**
      * 构造查询条件
@@ -2851,6 +2856,23 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
         QueryWrapper<AppRovalContractPageVo> qw = new QueryWrapper<>();
         qw.eq("bo.staffSid", sysUserVo.getStaffSid());
+        List<String> vinList = new ArrayList();
+        if (params.getStateType() == 1) {
+            List<BaseVehicleTempstateVo> data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData();
+            for (BaseVehicleTempstateVo datum : data) {
+                BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData();
+                vinList.add(vehicleSelectVo.getVinNo());
+            }
+        } else if (params.getStateType() == 2) {
+            List<BaseVehicleTempstateVo> data = baseVehicleTempstateFeign.selectAll(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode()).getData();
+            for (BaseVehicleTempstateVo datum : data) {
+                BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(datum.getVehSid()).getData();
+                vinList.add(vehicleSelectVo.getVinNo());
+            }
+        }
+        if (vinList.size() > 0) {
+            qw.notIn("bsov.linkNo", vinList);
+        }
         IPage<AppRovalContractPageVo> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppRovalContractPageVo> iPage = baseMapper.getApprovalContractList(page, qw, params.getName());
         for (AppRovalContractPageVo record : iPage.getRecords()) {
@@ -2868,4 +2890,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<AppRovalContractPageVo> list = baseMapper.selectByContractNo(contractNo);
         return list;
     }
+
+    public BusSalesOrderDetailsVo getByContractNo(String contractNo) {
+        BusSalesOrderDetailsVo vo = baseMapper.getByContractNo(contractNo);
+        return vo;
+    }
 }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finaccountnum/finaccountnum.vue

@@ -112,7 +112,6 @@ export default {
       // 查询 -----------
       tableKey: 0,
       list: [],
-      total: 1,
       listLoading: false,
       listQuery: {
         params: {
@@ -121,7 +120,8 @@ export default {
           userSid: ''
         },
         current: 1,
-        size: 5
+        size: 5,
+        total: 0
       },
       rules: {}
       // ------------------------------------
@@ -198,10 +198,10 @@ export default {
         this.listLoading = false
         if (response.code === '200' && response.data && response.data.total > 0) {
           this.list = response.data.records
-          this.total = response.data.total
+          this.listQuery.total = response.data.total
         } else {
           this.list = []
-          this.total = 0
+          this.listQuery.total = 0
         }
       })
     },

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@@ -183,7 +183,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: ''
+          createBySid: '',
+          state: ''
         },
         total: 0
       }
@@ -242,6 +243,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.state = 0
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.code === '200') {
@@ -266,7 +268,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: ''
+          createBySid: '',
+          state: ''
         },
         total: 0
       }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -579,6 +579,7 @@ export default {
         remittanceConfirmationUrl: '',
         balance: '',
         useOrgSid: '',
+        userSid: '',
         finSelectedReceivablesDetaileds: [],
         paymentVoucherAppendixs: [],
         remittanceConfirmationAppendixs: []

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue

@@ -166,7 +166,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: window.sessionStorage.getItem('staffSid')
+          createBySid: '',
+          state: ''
         },
         total: 0
       }
@@ -208,6 +209,8 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.state = 1
       listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.code === '200') {
@@ -231,7 +234,8 @@ export default {
           collectionTypeKey: '',
           subscriptionState: '',
           useOrgSid: '',
-          createBySid: window.sessionStorage.getItem('staffSid')
+          createBySid: '',
+          state: ''
         },
         total: 0
       }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml

@@ -96,7 +96,6 @@
         SELECT *, emergencyMobile AS mobile2
         FROM crm_customer_temp
         WHERE sid = #{sid}
-          AND staffSid = #{staffSid}
     </select>
     <!--根据客户的手机号以及当前登录者所在部门的sid查询该部门内是否有重复的-->
     <select id="selectByMobile" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.java

@@ -49,7 +49,7 @@ public interface CrmVisitMapper extends BaseMapper<CrmVisit> {
     @Update("update crm_visit set follow_state=#{followState}, follow_state_key=#{followStateKey} where sid=#{sid} limit 1")
     int updateAppFollowState(@Param("sid") String sid, @Param("followState") String followState, @Param("followStateKey") String followStateKey);
 
-    @Select("select * from crm_visit where customerSid=#{customerSid} and staffSid=#{staffSid} order by id desc ")
+    @Select("select * from crm_visit where customerSid=#{customerSid} order by id desc ")
     List<CrmVisitVo> selectListByCustomerSid(@Param("customerSid") String customerSid, @Param("staffSid") String staffSid);
 
     IPage<CrmVisitVo> pagerList(IPage<CrmVisitQuery> page, @Param(Constants.WRAPPER) Wrapper<CrmVisitVo> qw);

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvisit/CrmVisitMapper.xml

@@ -113,7 +113,6 @@
                positionInformation AS address
         from crm_visit
         where customerSid = #{sid}
-          and staffSid = #{staffSid}
         order by id desc LIMIT 0,1
     </select>
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -25,12 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -121,5 +123,9 @@ public interface FinCollectionConfirmationFeign {
     @GetMapping("/billeNoList")
     ResultBean<List<String>> billeNoList();
 
+    @ApiOperation("欠款提车-查询欠款金额及收款金额")
+    @GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}")
+    ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo);
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.fincollectionconfirmation;
 
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.core.query.PagerQuery;
@@ -126,4 +127,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean<List<String>> billeNoList() {
         return null;
     }
+
+    @Override
+    public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/AppBusArrearsCarryMoneyVo.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.fincollectionconfirmation.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class AppBusArrearsCarryMoneyVo implements Vo {
+    private static final long serialVersionUID = 315129249938477010L;
+
+    @ApiModelProperty("合同金额")
+    private BigDecimal contractAmount;
+
+    @ApiModelProperty("收款总金额")
+    private BigDecimal contractCollectionMoney;
+
+    @ApiModelProperty("欠款金额")
+    private BigDecimal arrearsMoney;
+
+    @ApiModelProperty("收款金额")
+    private BigDecimal subscriptionMoney;
+
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -27,6 +27,7 @@ package com.yxt.anrui.fin.biz.fincollectionconfirmation;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
 import com.yxt.common.base.utils.PagerUtil;
@@ -199,4 +200,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean<List<String>> billeNoList() {
         return finCollectionConfirmationService.billNoList();
     }
+
+    @Override
+    public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
+        return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -32,7 +32,10 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
+import com.yxt.anrui.base.api.commoncontract.CommonContract;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinSelectDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
@@ -95,6 +98,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private CommonContractFeign commonContractFeign;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -808,4 +813,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         List<String> stringList = baseMapper.billNoList();
         return rb.success().setData(stringList);
     }
+
+    public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
+        ResultBean<AppBusArrearsCarryMoneyVo> rb = ResultBean.fireFail();
+        AppBusArrearsCarryMoneyVo vo = new AppBusArrearsCarryMoneyVo();
+        //获取已认款金额
+        List<AppBusArrearsCarryMoneyVo> list = finSelectedReceivablesDetailedService.selByContractNo(contractNo);
+        BigDecimal subscriptionMoney = new BigDecimal(0);
+        for (AppBusArrearsCarryMoneyVo appBusArrearsCarryMoneyVo : list) {
+            subscriptionMoney = subscriptionMoney.add(appBusArrearsCarryMoneyVo.getSubscriptionMoney());
+        }
+        vo.setContractCollectionMoney(subscriptionMoney);
+        //获取欠款金额
+        CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData();
+        String contractAmount = commonContract.getContractAmount();
+        BigDecimal contractAmountMoney = new BigDecimal(contractAmount);
+        BigDecimal arrearsMoney = contractAmountMoney.subtract(subscriptionMoney);
+        vo.setArrearsMoney(arrearsMoney);
+        return rb.success().setData(vo);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
@@ -96,4 +97,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     void updateAuditDateBySid(String sid1);
 
     List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(@Param("collectionBillSid") String collectionBillSid);
+
+    List<AppBusArrearsCarryMoneyVo> selByContractNo(String contractNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -84,4 +84,15 @@
         FROM fin_selected_receivables_detailed
         WHERE collSid = #{collectionBillSid}
     </select>
+
+    <select id="selByContractNo"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo">
+        SELECT
+            fsrd.subscriptionMoney
+        FROM
+            fin_selected_receivables_detailed fsrd
+                LEFT JOIN fin_collection_confirmation fcc ON fcc.sid = fsrd.collSid
+        WHERE
+            fcc.paymentState = 1
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedQuery;
@@ -206,4 +207,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public List<AppFinSelectedReceivablesPaymentDetailsVo> selectByCollSid(String collectionBillSid) {
         return baseMapper.selectByCollSid(collectionBillSid);
     }
+
+    public List<AppBusArrearsCarryMoneyVo> selByContractNo(String contractNo) {
+        List<AppBusArrearsCarryMoneyVo> list = baseMapper.selByContractNo(contractNo);
+        return list;
+    }
 }

anrui-scm/anrui-scm-ui/.env.development

@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://anrui.yyundong.com"
+VUE_APP_URL = "http://192.168.1.100:8111"
 ##VUE_APP_URL = "http://120.46.172.184:8111"

anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue

@@ -64,10 +64,10 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>供应商办公电话</span>
+              <span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="manufacturerTelePhone">
+              <el-form-item>
                 <el-input v-model="baseManufacturerDto.manufacturerTelePhone" maxlength="20" placeholder="例:010-88888888" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
@@ -200,13 +200,6 @@ export default {
         callback()
       }
     }
-    var checkBanGongDianHua = (rule, value, callback) => {
-      const BanGongDianHua = /\d{3}-\d{8}|\d{4}-\d{7}/
-      if (BanGongDianHua.test(value)) {
-        return callback()
-      }
-      callback(new Error('请输入办公电话'))
-    }
     return {
       tableKey: 0,
       index: 0,
@@ -251,11 +244,6 @@ export default {
           message: '请填写供应商通讯地址',
           trigger: 'blur'
         }],
-        manufacturerTelePhone: [{
-          required: true,
-          validator: checkBanGongDianHua,
-          trigger: 'blur'
-        }],
         manufacturerFax: [{
           required: true,
           validator: checkChuanzhen,

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- Start 列表页面 -->
-    <div>
+    <div v-show="viewState == 1">
       <button-bar view-title="厂家系统认款" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
@@ -61,7 +61,7 @@
             </el-table-column>
             <el-table-column label="申请编号" align="center" width="200px">
               <template slot-scope="scope">
-                <span>{{ scope.row.proSchAppNo }}</span>
+                <span class="bluezi" @click="handleLook(scope.row.vehApplySid)">{{ scope.row.proSchAppNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="采购类型" align="center" width="200px">
@@ -111,6 +111,7 @@
       </div>
     </div>
     <!-- End 列表页面 -->
+    <cheliangpaichanInfo v-show="viewState == 2" ref="divInfo" @doback="reseaState"/>
     <!-- 照片弹窗 -->
     <el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
       <img width="100%" :src="dialogImageUrl" alt="" />
@@ -125,6 +126,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import upload from '@/components/uploadFileimg/upload'
+import cheliangpaichanInfo from '../../supplychain/cheliangpaichan/cheliangpaichanInfo'
 
 export default {
   name: 'changjiaxitongrenkuan',
@@ -132,11 +134,13 @@ export default {
     Pagination,
     pageye,
     upload,
-    ButtonBar
+    ButtonBar,
+    cheliangpaichanInfo
   },
   data() {
     return {
       btndisabled: false,
+      viewState: 1,
       btnList: [
         {
           type: 'info',
@@ -289,6 +293,10 @@ export default {
       }
       this.init()
     },
+    handleLook(sid) {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(sid)
+    },
     handPass(row) {
       req.adopt({ sid: row.sid, remarks: row.remarks, userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
         if (res.success) {
@@ -301,6 +309,9 @@ export default {
       this.dialogImgVisible = true
       this.dialogImageUrl = row.witMatUrl
     },
+    reseaState() {
+      this.viewState = 1
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)

anrui-system-ui/.env.development

@@ -5,5 +5,6 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
+##VUE_APP_URL = "http://26077a35f5.wicp.vip"
 VUE_APP_URL = "http://anrui.yyundong.com"
-
+##VUE_APP_URL = "http://1mn7264414.qicp.vip"

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

@@ -5,6 +5,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,7 +30,7 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private List<AppCarListVo> vinList = new ArrayList<>();
     @ApiModelProperty("欠款金额")
     @JsonProperty("cumulativeArrearsPrice")
-    private String arrearsMoney;
+    private BigDecimal arrearsMoney;
     @ApiModelProperty("车型")
     @JsonProperty("modelName")
     private String carModel;

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

@@ -13,4 +13,7 @@ public class AdvanceInvoicePageQuery implements Query {
 
     @ApiModelProperty("客户名称字段 合同编号字段")
     private String name;
+
+    @ApiModelProperty("状态")
+    private String type;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/approval/RovalContractPageQuery.java

@@ -14,4 +14,6 @@ public class RovalContractPageQuery implements Query {
     @ApiModelProperty("车架号 客户名称 合同编号")
     private String name;
 
+    @ApiModelProperty("状态")
+    private int stateType;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java

@@ -66,7 +66,7 @@ public interface AppBusArrearsCarryVehicleApplyFeign {
     public ResultBean saveArrearsApply(@Valid @RequestBody AdvanceArrearsDto dto);
 
     @ApiOperation("手机端-删除欠款提车")
-    @GetMapping("/deleteArrearsTakeCar")
+    @DeleteMapping("/deleteArrearsTakeCar")
     @ResponseBody
     public ResultBean deleteArrearsTakeCar(@SpringQueryMap AdvanceArrearsInfoQuery query);
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehicleQuery.java

@@ -14,4 +14,7 @@ public class ArrearsCarryVehicleQuery implements Query {
     @ApiModelProperty("客户名称 合同编号")
     private String name;
 
+    @ApiModelProperty("状态")
+    private String type;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java

@@ -110,5 +110,9 @@ public interface AppBusHandoverPrepareFeign {
     @ResponseBody
     ResultBean<HandoverPrepareInfoVo> getDeliveryPlanInfoDetail(@SpringQueryMap HandoverPrepareInfoQuery query);
 
+    @ApiOperation("提交交车准备信息")
+    @PostMapping("/submitDeliveryPlanInfo")
+    @ResponseBody
+    ResultBean submitDeliveryPlanInfo(@RequestBody HandoverPrepareDto dto);
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeignFallback.java

@@ -102,5 +102,10 @@ public class AppBusHandoverPrepareFeignFallback implements AppBusHandoverPrepare
         return null;
     }
 
+    @Override
+    public ResultBean submitDeliveryPlanInfo(HandoverPrepareDto dto) {
+        return null;
+    }
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/CertificateInfoQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,8 +12,11 @@ public class CertificateInfoQuery implements Query {
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+    @ApiModelProperty("车辆列表sid")
+    private String sid;
 
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/CertificateInfoVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,10 +11,12 @@ import java.util.List;
 public class CertificateInfoVo implements Vo {
     private static final long serialVersionUID = -4490288226803925013L;
 
+    @ApiModelProperty("车辆列表sid")
+    @JsonProperty("vinSid")
+    private String sid;
+
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
     @ApiModelProperty("")
     private String invoice;
     @ApiModelProperty("合格证日期")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleDto.java

@@ -16,18 +16,18 @@ public class HandoverPrepareVehicleDto implements Dto {
     private String vinNo; // 车架号
     @ApiModelProperty("开票状态")
     @JsonProperty("invoiceState")
-    private int invoicingState; // 开票状态
+    private boolean invoicingState; // 开票状态
     @ApiModelProperty("合格证状态")
     @JsonProperty("certificateState")
-    private int certificateState; // 合格证状态
+    private boolean certificateState; // 合格证状态
     @ApiModelProperty("保单状态")
     @JsonProperty("policyState")
-    private int policyState; // 保单状态
+    private boolean policyState; // 保单状态
     @ApiModelProperty("随车资料状态")
     @JsonProperty("carState")
-    private int onBoardDataState; // 随车资料状态
+    private boolean onBoardDataState; // 随车资料状态
     @ApiModelProperty("其他资料状态")
     @JsonProperty("otherState")
-    private int otherDataState; // 其他资料状态
+    private boolean otherDataState; // 其他资料状态
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/HandoverPrepareVehicleInfoVo.java

@@ -9,6 +9,9 @@ import lombok.Data;
 public class HandoverPrepareVehicleInfoVo implements Vo {
     private static final long serialVersionUID = 7834545131984653302L;
 
+    @ApiModelProperty("sid")
+    @JsonProperty("vinSid")
+    private String sid;
     @ApiModelProperty("交车申请表sid")
     private String mainSid; // 交车申请表sid
     @ApiModelProperty("车架号")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/InvoicingInfoQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,7 +12,7 @@ public class InvoicingInfoQuery implements Query {
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+    @ApiModelProperty("车辆列表sid")
+    private String sid;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/InvoicingInfoVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,10 +11,11 @@ import java.util.List;
 public class InvoicingInfoVo implements Vo {
     private static final long serialVersionUID = 4861045386236473486L;
 
+    @ApiModelProperty("车辆列表sid")
+    @JsonProperty("vinSid")
+    private String sid;
     @ApiModelProperty("车架号")
     private String vin;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
     @ApiModelProperty("发票代码")
     private String invoice;
     @ApiModelProperty("开票日期")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/OtherDataDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,10 +11,9 @@ import java.util.List;
 public class OtherDataDto implements Dto {
     private static final long serialVersionUID = -3050856559210777413L;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("车辆列表sid")
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("其他资料照片")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/OtherDataInfoQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,10 +11,10 @@ import java.util.List;
 public class OtherDataInfoQuery implements Query {
     private static final long serialVersionUID = -2645426505344369850L;
 
-    @ApiModelProperty("")
+
+    @ApiModelProperty("车辆列表sid")
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+
     @ApiModelProperty("车架号")
     private String vin;
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/OtherDataInfoVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,10 +11,9 @@ import java.util.List;
 public class OtherDataInfoVo implements Vo {
     private static final long serialVersionUID = 3389392232627388039L;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("车辆列表sid")
+    @JsonProperty("vinSid")
     private String sid;
-    @ApiModelProperty("车辆sid")
-    private String carSid;
     @ApiModelProperty("车架号")
     private String vin;
     @ApiModelProperty("其他资料照片")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/PolicyDto.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,10 +15,9 @@ public class PolicyDto implements Dto {
     private List<String> policyList;
     @ApiModelProperty("临时牌照")
     private List<String> licenceList;
-    @ApiModelProperty("sid")
-    private String sid;
-    @ApiModelProperty("车辆照片")
-    private String carSid;
     @ApiModelProperty("车架号")
     private String vin;
+
+    @ApiModelProperty("车辆列表sid")
+    private String sid;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/PolicyInfoQuery.java

@@ -8,13 +8,10 @@ import lombok.Data;
 public class PolicyInfoQuery implements Query {
     private static final long serialVersionUID = 7475128359557107062L;
 
-    @ApiModelProperty("sid")
-    private String sid;
-
     @ApiModelProperty("车架号")
     private String vin;
 
-    @ApiModelProperty("车辆sid")
-    private String carSid;
+    @ApiModelProperty("车辆列表sid")
+    private String sid;
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/PolicyInfoVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.deliveryPlan;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -14,11 +15,11 @@ public class PolicyInfoVo implements Vo {
     private List<String> policyList;
     @ApiModelProperty("临时牌照")
     private List<String> licenceList;
-    @ApiModelProperty("sid")
-    private String sid;
-    @ApiModelProperty("车辆照片")
-    private String carSid;
     @ApiModelProperty("车架号")
     private String vin;
 
+    @ApiModelProperty("车辆列表sid")
+    @JsonProperty("vinSid")
+    private String sid;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/StateDateDto.java

@@ -11,6 +11,8 @@ public class StateDateDto implements Dto {
 
     @ApiModelProperty("sid")
     private String sid;
+    @ApiModelProperty("vin")
+    private String vin;
     @ApiModelProperty("车辆sid")
     private String carSid;
     @ApiModelProperty("状态值")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareRest.java

@@ -111,4 +111,9 @@ public class AppBusHandoverPrepareRest implements AppBusHandoverPrepareFeign {
         return appBusHandoverPrepareService.getDeliveryPlanInfoDetail(query);
     }
 
+    @Override
+    public ResultBean submitDeliveryPlanInfo(HandoverPrepareDto dto) {
+        return appBusHandoverPrepareService.submitDeliveryPlanInfo(dto);
+    }
+
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/deliveryPlan/AppBusHandoverPrepareService.java

@@ -185,4 +185,11 @@ public class AppBusHandoverPrepareService {
         BeanUtil.copyProperties(appBusHandoverPrepareInfoVo, vo);
         return rb.success().setData(vo);
     }
+
+    public ResultBean submitDeliveryPlanInfo(HandoverPrepareDto dto) {
+        AppSubmitHandoverPrepareDto appSubmitHandoverPrepareDto = new AppSubmitHandoverPrepareDto();
+        BeanUtil.copyProperties(dto, appSubmitHandoverPrepareDto);
+        ResultBean resultBean = busHandoverPrepareFeign.submitDeliveryPlanInfo(appSubmitHandoverPrepareDto);
+        return resultBean;
+    }
 }