Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeign.java

@@ -139,4 +139,8 @@ public interface BaseDistributorFeign {
     @ApiOperation("二级经销商列表")
     @GetMapping("/selectDisList")
     ResultBean<List<BaseDistributorListVo>> selectDisList(@SpringQueryMap BaseDistributorListQuery query);
+
+    @ApiOperation("查询所有经销商信息")
+    @GetMapping("/selectAllDisList")
+    ResultBean<List<BaseDistributorListVo>> selectAllDisList();
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorFeignFallback.java

@@ -152,5 +152,10 @@ public class BaseDistributorFeignFallback implements BaseDistributorFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
+        return null;
+    }
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/BaseDistributorListVo.java

@@ -15,5 +15,13 @@ public class BaseDistributorListVo implements Vo {
     private String name;
     private String sid;
 
+    private String registNum;//税号
+    private String registDetailAddress;//地址
+    private String invoPhone;//开票联系电话
+    private String invoBank;//开票开户行
+    private String invoBankNum;//开票银行账号
+
+    private String openTickRemarks;
+
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigDto.java

@@ -76,4 +76,6 @@ public class BaseVehmodelConfigDto implements Dto {
 	private Integer isCommonModel;
 	@ApiModelProperty(value = "内部编码")
 	private String insideCode;
+
+	private String orgPath;
 }

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

@@ -23,6 +23,7 @@ public enum BillTypeEnum {
     XSDDHT("XSDDHT","销售订单合同"),
     XSDD("XSDD","销售订单"),
     SKD("SKD","款项确认"),
+    KPSQ("KPSQ","公司开票申请"),
     GCRK("GCRK","挂车入库"),
     SZRK("SZRK","上装入库"),
     XSDDTCSQ("XSDDTCSQ","销售订单退车申请"),

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basedistributor.*;
 import com.yxt.anrui.base.api.basedistributor.app.*;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -129,4 +130,7 @@ public interface BaseDistributorMapper extends BaseMapper<BaseDistributor> {
 
     @Select("select * from base_distributor where disName = #{disName} and createOrg = #{createOrg} and isDelete = 0 and sid != #{sid}")
     BaseDistributorsListVo selByNameAndOrgSidAndSid(@Param("disName") String disName,@Param("createOrg") String createOrg,@Param("sid") String sid);
+
+    List<BaseDistributorListVo> selectAllDisList();
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorMapper.xml

@@ -4,15 +4,15 @@
     <!--经销商分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorVo">
         SELECT bd.sid,
-               bd.disName,
-               bd.registNum,
-               bd.registDetailAddress,
-               bd.invoPhone,
-               bd.invoBank,
-               bd.invoBankNum,
-               bd.setUpTime,
-               bd.isGuarantee,
-               bd.pDistributorName
+        bd.disName,
+        bd.registNum,
+        bd.registDetailAddress,
+        bd.invoPhone,
+        bd.invoBank,
+        bd.invoBankNum,
+        bd.setUpTime,
+        bd.isGuarantee,
+        bd.pDistributorName
         FROM base_distributor bd
         <where>
             ${ew.sqlSegment}
@@ -42,7 +42,7 @@
         <!--序号-->
         (@rank := @rank + 1) rankNo
         FROM base_distributor bd,
-             (SELECT @rank := 0) t
+        (SELECT @rank := 0) t
         <where>
             ${ew.sqlSegment}
         </where>
@@ -57,14 +57,14 @@
     <!-- 分页查询中介单位, 联系人：分类为个人的话同经销商名称，企业的话为企业表的业务联系人-->
     <select id="getAppDistributorList" resultType="com.yxt.anrui.base.api.basedistributor.AppBaseDistributorChooseVo">
         SELECT bd.sid,
-               bd.distributorName,
-               bd.distributorClassificationValue,
-               bd.distributorLevelValue,
-               bd.businessMobile,
-               if(bd.distributorClassificationValue = '个人', bd.distributorClassificationValue, bdl.businessContact) AS
-                   businessContact
+        bd.distributorName,
+        bd.distributorClassificationValue,
+        bd.distributorLevelValue,
+        bd.businessMobile,
+        if(bd.distributorClassificationValue = '个人', bd.distributorClassificationValue, bdl.businessContact) AS
+        businessContact
         FROM base_distributor bd
-                 LEFT JOIN base_distributor_legal bdl ON bd.sid = bdl.distributorSid
+        LEFT JOIN base_distributor_legal bdl ON bd.sid = bdl.distributorSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -73,14 +73,14 @@
     <select id="getPcDistributorList"
             resultType="com.yxt.anrui.base.api.basedistributor.PcBaseDistributorChooseVo">
         SELECT bd.sid,
-               bd.distributorName,
-               bd.distributorClassificationValue,
-               bd.distributorLevelValue,
-               bd.businessMobile,
-               if(bd.distributorClassificationValue = '个人', bd.distributorClassificationValue, bdl.businessContact) AS
-                   businessContact
+        bd.distributorName,
+        bd.distributorClassificationValue,
+        bd.distributorLevelValue,
+        bd.businessMobile,
+        if(bd.distributorClassificationValue = '个人', bd.distributorClassificationValue, bdl.businessContact) AS
+        businessContact
         FROM base_distributor bd
-                 LEFT JOIN base_distributor_legal bdl ON bd.sid = bdl.distributorSid
+        LEFT JOIN base_distributor_legal bdl ON bd.sid = bdl.distributorSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -95,7 +95,7 @@
     <select id="namesDown" resultType="java.util.Map">
         SELECT bdb.sid, bdb.distributorName
         FROM base_distributor bdb
-            ${ew.customSqlSegment}
+                ${ew.customSqlSegment}
     </select>
 
     <select id="getBaseDistributorList" resultType="com.yxt.anrui.base.api.basedistributor.PcBaseDistributorVo">
@@ -112,21 +112,21 @@
     </select>
 
     <select id="getDistributorList" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsListVo">
-        select sid, disName , pDistributorName, registNum, contract, mobile
+        select sid, disName, pDistributorName, registNum, contract, mobile
         from base_distributor ${ew.customSqlSegment}
     </select>
 
     <select id="getDistributorListOne" resultType="com.yxt.anrui.base.api.basedistributor.app.BaseDistributorsVo">
         SELECT bd.sid,
-               bd.disName,
-               case bd.state
-                   when 1 then '未备案'
-                   when 2 then '已备案' end             as state,
-               if(length(bd.pDistributorName)>0,bd.pDistributorName,'无') as pDistributorName,
-               bd.registNum,
-               bd.registDetailAddress,
-               bd.invoPhone,
-               DATE_FORMAT(bd.setUpTime, '%Y-%m-%d') as setUpTime
+        bd.disName,
+        case bd.state
+        when 1 then '未备案'
+        when 2 then '已备案' end as state,
+        if(length(bd.pDistributorName)>0,bd.pDistributorName,'无') as pDistributorName,
+        bd.registNum,
+        bd.registDetailAddress,
+        bd.invoPhone,
+        DATE_FORMAT(bd.setUpTime, '%Y-%m-%d') as setUpTime
         FROM base_distributor bd
         <where>
             ${ew.sqlSegment}
@@ -187,7 +187,7 @@
     </update>
 
     <select id="selectDisList" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">
-        select disName as name,sid
+        select disName as name, sid
         from base_distributor
         where length(pDistributorSid) > 0
           and useOrg = #{orgSid}
@@ -199,10 +199,31 @@
     </select>
 
     <select id="selectNameByOne" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
-        select * from base_distributor where disName = #{name} AND createOrg = #{useOrgSid} and isDelete = 0
+        select *
+        from base_distributor
+        where disName = #{name}
+          AND createOrg = #{useOrgSid}
+          and isDelete = 0
     </select>
 
     <select id="selectOneBy" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributor">
-        select * from base_distributor where disName = #{name} AND createOrg = #{useOrgSid} AND sid &lt;&gt; #{sid} and isDelete = 0
+        select *
+        from base_distributor
+        where disName = #{name}
+          AND createOrg = #{useOrgSid}
+          AND sid &lt;&gt; #{sid}
+          and isDelete = 0
+    </select>
+
+    <select id="selectAllDisList" resultType="com.yxt.anrui.base.api.basedistributor.BaseDistributorListVo">
+        SELECT sid,
+               disName AS 'name',
+                registNum,
+               registDetailAddress,
+               invoPhone,
+               invoBank,
+               invoBankNum
+        FROM base_distributor
+        WHERE isDelete = 0
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorRest.java

@@ -261,4 +261,9 @@ public class BaseDistributorRest implements BaseDistributorFeign {
     public ResultBean<List<BaseDistributorListVo>> selectDisList(BaseDistributorListQuery query) {
         return baseDistributorService.selectDisList(query);
     }
+
+    @Override
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
+        return baseDistributorService.selectAllDisList();
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@@ -831,4 +831,15 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<BaseDistributorListVo>> selectAllDisList() {
+        ResultBean rb = ResultBean.fireFail();
+        List<BaseDistributorListVo> baseDistributorListVos = baseMapper.selectAllDisList();
+        for (BaseDistributorListVo baseDistributorListVo : baseDistributorListVos) {
+            String openTickRemarks = "";
+            //openTickRemarks = openTickRemarks + baseDistributorListVo.getRegistNum() + "；" + baseDistributorListVo.getRegistDetailAddress() + "；" + baseDistributorListVo.getInvoPhone() + "；" + baseDistributorListVo.getInvoBank() + "；" + baseDistributorListVo.getInvoBankNum();
+            baseDistributorListVo.setOpenTickRemarks(openTickRemarks);
+        }
+        return rb.success().setData(baseDistributorListVos);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -75,7 +75,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     public ResultBean save(BaseModelConfigDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String userSid = dto.getUserSid();
-        String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+//        String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
@@ -162,7 +162,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         configName = baseModelConfigService.configNameSpell(entity);
         entity.setConfigName(configName);
         configName += dto.getOtherConfig();
-        List<String> stringList = baseModelConfigService.checkByConfigName(sid);
+        List<String> stringList = baseModelConfigService.checkByConfigName(dto.getCreateOrgSId());
         if (stringList != null || stringList.size() > 0){
             for (String s : stringList) {
                 if (configName.equals(s)){
@@ -170,7 +170,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
                 }
             }
         }
-        entity.setCreateOrgSId(sid);
+//        entity.setCreateOrgSId(sid);
         // 配置编码
         int i1 = baseModelConfigService.selectCount();
         String num = String.format("%04d", i1 + 1); // 不足4位补0

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -502,7 +502,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (StringUtils.isBlank(sid)) {
             BaseVehicleModel entity = new BaseVehicleModel();
             String userSid = dto.getUserSid();
-            String sid2 = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+//            String sid2 = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
             BeanUtil.copyProperties(dto, entity,"sid");
             modelName = appendModelName(entity);
             entity.setModelName(modelName);
@@ -511,7 +511,7 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
             if (i > 0) {
                 return rb.setMsg("该车型信息已存在");
             }
-            entity.setCreateOrg(sid2);
+//            entity.setCreateOrg(sid2);
             // 配置编码
             int i1 = baseMapper.selectCount();
             String num = String.format("%04d", i1 + 1); // 不足4位补0

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -37,7 +37,6 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
-import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -440,7 +439,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         for (BaseVehmodelConfigDto baseVehmodelConfigDto : dto) {
             String modelSid = baseVehmodelConfigDto.getModelSid();
             String configurationItemsSid = baseVehmodelConfigDto.getConfigurationItemsSid();
-            ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(baseVehmodelConfigDto.getUserSid());
+//            ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(baseVehmodelConfigDto.getUserSid());
+            ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(baseVehmodelConfigDto.getOrgPath());
             if ("0".equals(resultBean.getData())) {
                 return rb.setMsg("该用户无分公司，不允许操作");
             }
@@ -452,9 +452,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
             String sid = baseVehmodelConfig.getSid();
             BeanUtil.copyProperties(dto, baseVehmodelConfig);
             baseVehmodelConfig.setSid(sid);
-            ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(baseVehmodelConfigDto.getUserSid());
-            String orgSid = useOrgByUserSid.getData().getSid();
-            baseVehmodelConfig.setUseOrgSid(orgSid);
+//            ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(baseVehmodelConfigDto.getUserSid());
+//            String orgSid = useOrgByUserSid.getData().getSid();
+            baseVehmodelConfig.setUseOrgSid(resultBean.getData());
             baseVehmodelConfig.setModelSid(modelSid);
             baseVehmodelConfig.setConfigurationItemsSid(configurationItemsSid);
             save(baseVehmodelConfig);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -509,18 +509,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 e.printStackTrace();
             }
             //==================================添加线程
-            /*//极光推送
-            busVehicleApply.set(fetchBySid(businessSid));
-            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-            MessageFlowVo messageFlowVo = new MessageFlowVo();
-            BeanUtil.copyProperties(ufVo, messageFlowVo);
-            messageFlowableQuery.setUfVo(messageFlowVo);
-            messageFlowableQuery.setAppMap(appMap);
-            messageFlowableQuery.setBusinessSid(businessSid);
-            messageFlowableQuery.setModuleName("厂家采购申请");
-            messageFlowableQuery.setMsgContent(busVehicleApply.get().getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-            messageFlowableQuery.setMsgTitle("厂家采购");
-            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);*/
             return voResultBean;
         }
         if (r == 2) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDelivered.java

@@ -78,4 +78,15 @@ public class BusDelivered extends BaseEntity {
     private String useOrgSid;
     @ApiModelProperty(value = "使用组织名称")
     private String useOrgName;
+    
+    @ApiModelProperty("返利人1")
+    private String distributorName;
+    @ApiModelProperty("返利金额1")
+    private String distributorPrice;
+    @ApiModelProperty("返利人2")
+    private String distributorNameTwo;
+    @ApiModelProperty("返利金额2")
+    private String distributorPriceTwo;
+    @ApiModelProperty("销售折让")
+    private String singleCarDiscountPrice;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java

@@ -52,8 +52,6 @@ public class BusDeliveredDto implements Dto {
     private static final long serialVersionUID = -6078868417258339533L;
     private String sid;
 
-    /* @ApiModelProperty("类型：1车款交清、2欠款提车")
-     private Integer type;*/
     @ApiModelProperty("款项类型")
     private String subscription;
     private String subscriptionKey;
@@ -75,13 +73,23 @@ public class BusDeliveredDto implements Dto {
     private String idNo;
     @ApiModelProperty(value = "联系地址")
     private String address;
-
     @ApiModelProperty(value = "成交价")
     private String price;
-
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
     @ApiModelProperty("分公司名称")
     private String useOrgName;
 
+
+    @ApiModelProperty("返利人1")
+    private String distributorName;
+    @ApiModelProperty("返利金额1")
+    private String distributorPrice;
+    @ApiModelProperty("返利人2")
+    private String distributorNameTwo;
+    @ApiModelProperty("返利金额2")
+    private String distributorPriceTwo;
+    @ApiModelProperty("销售折让")
+    private String singleCarDiscountPrice;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java

@@ -52,11 +52,10 @@ public class BusDeliveredVo implements Vo {
     private static final long serialVersionUID = -9212919952192716940L;
     private String sid;
 
-//    @ApiModelProperty("类型：1已交款、2未交款")
     @ApiModelProperty("业务状态")
-    private String type;
-    @ApiModelProperty("销售类型")
-    private String paymentMethod;
+    private String subscription;
+    @ApiModelProperty("业务状态key")
+    private String subscriptionKey;
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("客户名称")
@@ -75,4 +74,20 @@ public class BusDeliveredVo implements Vo {
     private String price;
 
 
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
+    @ApiModelProperty("销售类型key")
+    private String paymentMethodKey;
+    @ApiModelProperty("返利人1")
+    private String distributorName;
+    @ApiModelProperty("返利金额1")
+    private String distributorPrice;
+    @ApiModelProperty("返利人2")
+    private String distributorNameTwo;
+    @ApiModelProperty("返利金额2")
+    private String distributorPriceTwo;
+    @ApiModelProperty("销售折让")
+    private String singleCarDiscountPrice;
+
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java

@@ -26,14 +26,11 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApply.java <br/>
@@ -54,43 +51,41 @@ public class BusDeliveredApply extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("合同编号")
-    private String contractNo; // 合同编号
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty("申请日期")
-    private Date applyDate; // 申请日期
+    private String contractNo;
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("客户名称")
-    private String name; // 客户名称
+    private String name;
     @ApiModelProperty("车型Sid")
     private String modelSid;
     @ApiModelProperty("配置Sid")
     private String configSid;
     @ApiModelProperty("车型别名")
-    private String modelName; // 车型别名
-    @ApiModelProperty("是否是终端:1是，0不是")
-    private Integer isTerminal; // 是否是终端:1是，0不是
+    private String modelName;
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
+    @ApiModelProperty("销售类型key")
+    private String paymentMethodKey;
     @ApiModelProperty(value = "申请人")
     private String applyName;
     @ApiModelProperty(value = "申请人sid")
     private String applySid;
-    @ApiModelProperty(value = "申请人分公司sid")
-    private String orgSid;
+    @ApiModelProperty(value = "分公司sid")
+    private String useOrgSid;
+    /* @ApiModelProperty("是否是终端:1是，0不是")
+     private Integer isTerminal;*/
     @ApiModelProperty(value = "客户手机号")
     private String mobile;
-    @ApiModelProperty(value = "创建人sid")
-    private String createBySid;
-    @ApiModelProperty("备注")
-    private String remarks;
     @ApiModelProperty(value = "节点状态")
     private String nodeState;
     @ApiModelProperty(value = "节点id")
-    private String nodeId;
+    private String taskDefKey;
     @ApiModelProperty(value = "流程id")
     private String procDefId;
     @ApiModelProperty(value = "实例id")
     private String procInstId;
     @ApiModelProperty(value = "任务id")
     private String taskId;
-
     @ApiModelProperty("发起部门sid")
     private String applyDeptSid;
     @ApiModelProperty("发起部门")
@@ -108,4 +103,18 @@ public class BusDeliveredApply extends BaseEntity {
     @ApiModelProperty("贷款人手机号")
     private String loanMobile;
 
+    @ApiModelProperty("实际购车人类型:0订单客户，1贷款人，2其他人")
+    private String type;
+
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("返利人sid")
+    private String distributorName;
+    @ApiModelProperty("返利金额1")
+    private String distributorPrice;
+    @ApiModelProperty("返利人2sid")
+    private String distributorNameTwo;
+    @ApiModelProperty("返利金额2")
+    private String distributorPriceTwo;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java

@@ -32,7 +32,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -54,29 +53,59 @@ import java.util.List;
 public class BusDeliveredApplyDetailVo implements Vo {
 
     private static final long serialVersionUID = -2021344742801203695L;
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("发起部门sid")
+    private String applyDeptSid;
+    @ApiModelProperty("发起部门")
+    private String applyDept;
+    @ApiModelProperty("发起人sid")
+    private String applySid;
+    @ApiModelProperty("发起人")
+    private String applyName;
+    @ApiModelProperty("发起日期")
+    private String createTime;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("销售部门sid")
+    private String staffDeptSid;
+    @ApiModelProperty("销售部门")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("销售类型key")
+    private String paymentMethodKey;
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
     @ApiModelProperty("合同编号")
     private String contractNo;
-    @ApiModelProperty("申请日期")
-    private String applyDate;
     @ApiModelProperty("客户名称")
     private String name;
-    @ApiModelProperty(value = "客户手机号")
+    @ApiModelProperty("客户手机号")
     private String mobile;
     @ApiModelProperty("车型别名")
     private String modelName;
-    @ApiModelProperty("是否是终端:1是，0不是")
-    private Integer isTerminal;
-    @ApiModelProperty("用户sid")
-    private String userSid;
-    @ApiModelProperty("任务id")
-    private String taskId;
-    @ApiModelProperty("流程实例id")
-    private String procInstId;
-    @ApiModelProperty(value = "节点id")
-    private String taskDefKey;
-    @ApiModelProperty("流程定义id")
-    private String procDefId;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款人手机号")
+    private String loanMobile;
+    @ApiModelProperty("实际购车人类型:0订单客户，1贷款人，2其他人")
+    private String type;
     @ApiModelProperty(value = "出库申请车辆信息")
     private List<BusDeliveredApplyDetailsVo> listVo = new ArrayList<>();
 
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("返利人sid")
+    private String distributorName;
+    @ApiModelProperty("返利金额1")
+    private String distributorPrice;
+    @ApiModelProperty("返利人2sid")
+    private String distributorNameTwo;
+    @ApiModelProperty("返利金额2")
+    private String distributorPriceTwo;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java

@@ -26,14 +26,12 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -57,22 +55,52 @@ public class BusDeliveredApplyDto implements Dto {
     @ApiModelProperty(value = "出库申请sid")
     private String sid;
     private String userSid;
+    @ApiModelProperty("发起部门sid")
+    private String applyDeptSid;
+    @ApiModelProperty("发起部门")
+    private String applyDept;
+    @ApiModelProperty("发起人sid")
+    private String applySid;
+    @ApiModelProperty("发起人")
+    private String applyName;
+    @ApiModelProperty("销售部门sid")
+    private String staffDeptSid;
+    @ApiModelProperty("销售部门")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员用户sid")
+    private String staffUserSid;
+    @ApiModelProperty("销售专员")
+    private String staffName;
+    @ApiModelProperty("销售类型key")
+    private String paymentMethodKey;
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
     @ApiModelProperty("合同编号")
     private String contractNo;
-    @ApiModelProperty(value = "申请人")
-    private String applyName;
-    @ApiModelProperty(value = "申请人sid")
-    private String applySid;
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @ApiModelProperty("申请日期")
-    private Date applyDate; // 申请日期
     @ApiModelProperty("客户名称")
     private String name;
+    @ApiModelProperty("客户手机号")
+    private String mobile;
     @ApiModelProperty("车型别名")
     private String modelName;
-    @ApiModelProperty("是否是终端:1是，0不是")
-    private Integer isTerminal;
+    @ApiModelProperty("贷款人")
+    private String loanName;
+    @ApiModelProperty("贷款人手机号")
+    private String loanMobile;
+    @ApiModelProperty("实际购车人类型:0订单客户，1贷款人，2其他人")
+    private String type;
     @ApiModelProperty(value = "出库申请的车辆信息")
     private List<BusDeliveredApplyDetailsDto> detailsList;
+    private String orgPath;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("返利人sid")
+    private String distributorName;
+    @ApiModelProperty("返利金额1")
+    private String distributorPrice;
+    @ApiModelProperty("返利人2sid")
+    private String distributorNameTwo;
+    @ApiModelProperty("返利金额2")
+    private String distributorPriceTwo;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -92,7 +92,7 @@ public interface BusDeliveredApplyFeign {
      */
     @ApiOperation("提交")
     @PostMapping("/submit")
-    @ResponseBody
+//    @ResponseBody
     ResultBean submit(@RequestBody BusDeliveredApplyDto dto);
 
     /**
@@ -103,7 +103,7 @@ public interface BusDeliveredApplyFeign {
      */
     @ApiOperation("列表上的提交")
     @PutMapping("/submitBySid")
-    @ResponseBody
+//    @ResponseBody
     ResultBean submitBySid(@RequestParam(value = "sid") String sid);
 
     /**
@@ -114,7 +114,7 @@ public interface BusDeliveredApplyFeign {
      */
     @ApiOperation("列表上的撤回")
     @PutMapping("/revokeBySid")
-    @ResponseBody
+//    @ResponseBody
     ResultBean revokeBySid(@RequestParam(value = "sid") String sid);
 
     /**

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java

@@ -52,11 +52,19 @@ public class BusDeliveredApplyVo implements Vo {
     private String sid;
     @ApiModelProperty(value = "状态")
     private String nodeState;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("销售类型")
+    private String paymentMethod;
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty("客户名称")
     private String name;
-    @ApiModelProperty("申请日期")
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("台数")
+    private int num;
+    @ApiModelProperty("发起日期")
     private String applyDate;
     @ApiModelProperty(value = "申请人")
     private String applyName;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/SubmitDeliveredApplyDto.java

@@ -7,8 +7,7 @@ import lombok.Data;
 public class SubmitDeliveredApplyDto extends BusDeliveredApplyDto {
 
     private static final long serialVersionUID = 452003563735204012L;
-    @ApiModelProperty("意见")
-    private String comment;
+    
     @ApiModelProperty("流程实例id")
     private String instanceId;
     @ApiModelProperty("任务id")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetails.java

@@ -50,15 +50,21 @@ import lombok.Data;
 public class BusDeliveredApplyDetails extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@ApiModelProperty("出库申请sid")
-    private String applySid; // 出库申请sid
-	@ApiModelProperty("车架号")
-    private String vinNo; // 车架号
-	@ApiModelProperty("成交价")
-    private String price; // 成交价
+    @ApiModelProperty("出库申请sid")
+    private String applySid;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+
     @ApiModelProperty("备注")
-    private String remarks; // 成交价
-	@ApiModelProperty("使用人信息sid")
-    private String useMessageSid; // 使用人信息sid
+    private String remarks;
+    @ApiModelProperty("使用人信息sid")
+    private String useMessageSid;
+    
+    @ApiModelProperty("销售折让")
+    private String singleCarDiscountPrice;
+    @ApiModelProperty("赠送套餐")
+    private String discountAll;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsDto.java

@@ -26,12 +26,16 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapplydetails;
 
 
+import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountDto;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyDetailsDto.java <br/>
@@ -52,13 +56,17 @@ public class BusDeliveredApplyDetailsDto implements Dto {
     private static final long serialVersionUID = 2067369170796332433L;
     @ApiModelProperty("车架号")
     private String vinNo;
-    @ApiModelProperty("成交价")
-    private String price;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
     @ApiModelProperty(value = "备注")
     private String remarks;
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
     @ApiModelProperty(value = "使用人信息")
     private BusDeliveredUseMessageDto useMessage;
+    @ApiModelProperty("销售折让")
+    private String singleCarDiscountPrice;
+    @ApiModelProperty("赠送套餐")
+    private String discountAll;
+    @ApiModelProperty("套餐list")
+    private List<BusDeliveredDetailsDiscountDto> discountList = new ArrayList<>();
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsVo.java

@@ -50,17 +50,21 @@ import lombok.Data;
 public class BusDeliveredApplyDetailsVo implements Vo {
 
     private static final long serialVersionUID = -6554786073803370571L;
-    @ApiModelProperty(value = "出库关联车辆sid")
-    private String sid;
     @ApiModelProperty("车架号")
     private String vinNo;
-    @ApiModelProperty("成交价")
-    private String price;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
     @ApiModelProperty(value = "使用人信息sid")
     private String useMessageSid;
     @ApiModelProperty(value = "使用人信息")
     private BusDeliveredUseMessageVo useMessage;
-    @ApiModelProperty(value = "备注")
-    private String remarks;
+    
+    @ApiModelProperty("销售折让")
+    private String singleCarDiscountPrice;
+    @ApiModelProperty("赠送套餐")
+    private String discountAll;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivereddetailsdiscount/BusDeliveredDetailsDiscount.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/7 8:52
+ * @Description
+ */
+@Data
+public class BusDeliveredDetailsDiscount extends BaseEntity {
+    private static final long serialVersionUID = 405239497732749032L;
+    @ApiModelProperty("关联的车辆表的sid")
+    private String detailsSid;
+    @ApiModelProperty("出库申请sid")
+    private String applySid;
+    @ApiModelProperty("优惠包名称")
+    private String name;
+    @ApiModelProperty("价值")
+    private String price;
+    @ApiModelProperty("优惠包项目说明")
+    private String discountExplain;
+    @ApiModelProperty("数量")
+    private Integer num;
+    @ApiModelProperty("本次剩余数量")
+    private Integer giveNum;
+    @ApiModelProperty("优惠包sid")
+    private String discountSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountDto.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/7 15:46
+ * @Description
+ */
+@Data
+public class BusDeliveredDetailsDiscountDto implements Dto {
+    private static final long serialVersionUID = 5462568049453200753L;
+
+    @ApiModelProperty("优惠包名称")
+    private String name;
+    @ApiModelProperty("价值")
+    private String price;
+    @ApiModelProperty("优惠包项目说明")
+    private String discountExplain;
+    @ApiModelProperty("数量")
+    private Integer num;
+    @ApiModelProperty("本次剩余数量")
+    private Integer giveNum;
+    @ApiModelProperty("优惠包sid")
+    private String discountSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountVo.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/7 16:26
+ * @Description
+ */
+@Data
+public class BusDeliveredDetailsDiscountVo implements Vo {
+    private static final long serialVersionUID = 1624728389839141202L;
+
+    @ApiModelProperty("优惠包名称")
+    private String name;
+    @ApiModelProperty("价值")
+    private String price;
+    @ApiModelProperty("优惠包项目说明")
+    private String discountExplain;
+    @ApiModelProperty("数量")
+    private Integer num;
+    @ApiModelProperty("本次剩余数量")
+    private Integer giveNum;
+    @ApiModelProperty("优惠包sid")
+    private String discountSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeign.java

@@ -74,5 +74,5 @@ public interface BusSalesOrderDiscountFeign {
     @ApiOperation("出库选择套餐列表")
     @GetMapping("/discountList")
     @ResponseBody
-    ResultBean<List<OrderDiscountVo>> discountList(@RequestParam("contractNo") String contractNo,@RequestParam("vinSid")String vinSid);
+    ResultBean<List<OrderDiscountVo>> discountList(@RequestParam("contractNo") String contractNo, @RequestParam(value = "vinSid", required = false) String vinSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/OrderDiscountVo.java

@@ -24,4 +24,7 @@ public class OrderDiscountVo {
     @ApiModelProperty("本次赠送数量")
     private Integer giveNum;
 
+    @ApiModelProperty("优惠包sid")
+    private String discountSid;
+
 }

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

@@ -788,7 +788,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid());
                 for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
                     AppVinListDto appVinListDto = new AppVinListDto();
-                    appVinListDto.setVIN(vehicleDetailsVo.getVinNo());
+                    appVinListDto.setVinNo(vehicleDetailsVo.getVinNo());
                     vinList.add(appVinListDto);
                 }
                 addInvoicedApplyDto.setVinList(vinList);
@@ -917,7 +917,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService<BusAdvanc
                 List<BusGinvoiceapplyVehicleDetailsVo> busGinvoiceapplyVehicleDetailsVos = busGinvoiceapplyVehicleService.fetchByAdvGinSid(busAdvanceGinvoiceapply.getSid());
                 for (BusGinvoiceapplyVehicleDetailsVo vehicleDetailsVo : busGinvoiceapplyVehicleDetailsVos) {
                     AppVinListDto appVinListDto = new AppVinListDto();
-                    appVinListDto.setVIN(vehicleDetailsVo.getVinNo());
+                    appVinListDto.setVinNo(vehicleDetailsVo.getVinNo());
                     appVinListDto.setBillTypeKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getCode());
                     appVinListDto.setBillTypeValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_INVOICING.getRemarks());
                     vinList.add(appVinListDto);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.xml

@@ -11,16 +11,23 @@
         bd.name,
         <!--车架号-->
         bd.vinNo,
-        <!--认款状态-->
-        bd.subscription as type,
+        bd.subscription,
+        bd.subscriptionKey,
+        bd.paymentMethodKey,
+        bd.paymentMethod,
         bd.modelName,
         bd.price,
         bd.mobile,
         bd.idNo,
         bd.address,
-        bd.price
+        bd.price,
+        bd.distributorName,
+        bd.distributorPrice,
+        bd.distributorNameTwo,
+        bd.distributorPriceTwo,
+        bd.singleCarDiscountPrice
         FROM bus_delivered bd
-        ${ew.customSqlSegment}
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
@@ -39,11 +46,11 @@
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
                 and concat(IFNULL(bd.contractNo
-                , '')
-                , ifnull(bd.`name`
-                , '')) LIKE concat('%'
-                , #{name}
-                , '%')
+                  , '')
+                  , ifnull(bd.`name`
+                  , '')) LIKE concat('%'
+                  , #{name}
+                  , '%')
             </if>
         </where>
         group by bd.contractNo

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@@ -98,10 +98,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             if (query.getVinNoList().size() > 0) {
                 qw.notIn("bd.vinNo", query.getVinNoList());
             }
-//            //用户sid
-//            if (StringUtils.isNotBlank(query.getUserSid())) {
-//                qw.eq("bd.createBySid", query.getUserSid());
-//            }
             //待出库：1，出库申请：0
             qw.eq("bd.state", 1);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@@ -37,7 +37,6 @@ import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -62,7 +61,7 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
 
     IPage<BusDeliveredApplyVo> selectPageVo(IPage<BusDeliveredApply> page, @Param(Constants.WRAPPER) Wrapper<BusDeliveredApply> qw);
 
-    int updateStateBySid(@Param("state") int i, @Param("sid") String sid, @Param("today") Date today);
+    int updateStateBySid(@Param("state") int i, @Param("sid") String sid);
 
     /**
      * 查询除了待提交状态外其他的还包含其他的状态，若包含则返回false

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -12,7 +12,8 @@
         bd.procInstId,
         bd.procDefId,
         DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as applyDate,
-        bd.applyName
+        bd.applyName,
+        bd.modelName
         FROM bus_delivered_apply bd
         <where>
             ${ew.sqlSegment}
@@ -21,8 +22,7 @@
 
     <update id="updateStateBySid">
         update bus_delivered_apply
-        set state     = #{state},
-            applyDate = #{today}
+        set state     = #{state}
         where sid = #{sid}
     </update>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -44,6 +44,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
 import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
 import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
+import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@@ -114,6 +115,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     BaseVehicleFeign baseVehicleFeign;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private BusDeliveredDetailsDiscountService busDeliveredDetailsDiscountService;
 
     /**
      * 构造出库申请的查询条件
@@ -160,30 +163,29 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      */
     public ResultBean saveOrUpdateDto(BusDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (dto.getDetailsList().size() <= 0) {
-            return rb.setMsg("请选择车辆信息!!!");
+        if (dto.getDetailsList().size() == 0) {
+            return rb.setMsg("请选择车辆信息!");
         }
-        if (dto.getIsTerminal() == 3) {
-            return rb.setMsg("请选择是否为终端客户!!!");
+        if (StringUtils.isBlank(dto.getType())) {
+            return rb.setMsg("请选择实际购车人!");
         }
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             //新增
             BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
-            String mobile = dto.getDetailsList().get(0).getUseMessage().getMobile();
-            busDeliveredApply.setMobile(mobile);
-            busDeliveredApply.setCreateBySid(dto.getUserSid());
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
+            busDeliveredApply.setCreateBySid(dto.getUserSid());
+            String useOrgSid = "";
+            if (StringUtils.isNotBlank(dto.getOrgPath())) {
+                useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+            } else {
+                useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+            }
+            busDeliveredApply.setUseOrgSid(useOrgSid);
             List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
             if (dtoList.size() > 0) {
                 busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
             }
-
-            //根据申请人sid查询分公司sid
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getApplySid());
-            if (stringResultBean.getSuccess()) {
-                busDeliveredApply.setOrgSid(stringResultBean.getData());
-            }
             save(busDeliveredApply);
             dtoSid = busDeliveredApply.getSid();
         } else {
@@ -191,9 +193,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (busDeliveredApply == null) {
                 return rb.setMsg("该申请不存在");
             }
-            //删除
-            busDeliveredApplyDetailsService.deleteByApplySid(dtoSid);
-            busDeliveredUseMessageService.deleteByApplySid(dtoSid);
             List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
             if (dtoList.size() > 0) {
                 busDeliveredApplyDetailsService.saveList(dtoList, busDeliveredApply.getSid());
@@ -219,10 +218,10 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         BeanUtil.copyProperties(entity, vo);
         vo.setUserSid(entity.getCreateBySid());
-        vo.setTaskDefKey(entity.getNodeId());
-        String format = DateUtil.format(entity.getApplyDate(), "yyyy-MM-dd");
-        vo.setApplyDate(format);
-        if (vo.getIsTerminal().equals(1)) {
+//        vo.setTaskDefKey(entity.getTaskDefKey());
+        String format = DateUtil.format(entity.getCreateTime(), "yyyy-MM-dd");
+        vo.setCreateTime(format);
+        if ("0".equals(vo.getType())) {
             List<BusDeliveredApplyDetailsVo> voList = busDeliveredApplyDetailsService.detailsList(sid);
             voList.removeAll(Collections.singleton(null));
             if (!voList.isEmpty()) {
@@ -239,8 +238,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 }
             }
             vo.setListVo(voList);
-
-        } else if (vo.getIsTerminal().equals(0)) {
+        } else {
             //根据出库申请单的sid查询需要出库的车辆信息
             List<BusDeliveredApplyDetailsVo> voList = busDeliveredApplyDetailsService.detailsList(sid);
             for (int i = 0; i < voList.size(); i++) {
@@ -251,7 +249,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             vo.setListVo(voList);
         }
-
         return rb.success().setData(vo);
     }
 
@@ -268,7 +265,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             String sid = resultBean.getData().toString();
             //更新出库申请的状态为待审核。
             //状态：1待提交，2待审核，3已通过，4未通过
-            baseMapper.updateStateBySid(2, sid, DateUtil.date());
+            baseMapper.updateStateBySid(2, sid);
             return rb.success().setMsg("提交成功");
         }
         return rb.setMsg(resultBean.getMsg());
@@ -287,7 +284,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             return rb.setMsg("该出库申请不存在");
         }
         //状态：1待提交，2待审核，3已通过，4未通过
-        baseMapper.updateStateBySid(2, sid, DateUtil.date());
+        baseMapper.updateStateBySid(2, sid);
         return rb.success().setMsg("提交成功");
     }
 
@@ -307,7 +304,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         if (!busDeliveredApply.getState().equals(2)) {
             return rb.setMsg("撤回失败,该申请已在审核中");
         }
-        baseMapper.updateStateBySid(1, sid, DateUtil.date());
+        baseMapper.updateStateBySid(1, sid);
         return rb.success().setMsg("撤回成功");
     }
 
@@ -336,6 +333,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             for (int i = 0; i < sidsList.size(); i++) {
                 busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));
                 busDeliveredUseMessageService.deleteByApplySid(sidsList.get(i));
+                busDeliveredDetailsDiscountService.deleteByApplySid(sidsList.get(i));
                 deleteBySid(sidsList.get(i));
             }
         }
@@ -447,7 +445,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      */
     public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        //根据用户sid获取staffSid
+        String orgSidPath = dto.getOrgPath();
+        /*//根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
         if (!userVoResultBean.getSuccess()) {
             return rb.setMsg(userVoResultBean.getMsg());
@@ -456,9 +455,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
         if (!staffOrgResultBean.getSuccess()) {
             return rb.setMsg(staffOrgResultBean.getMsg());
-        }
+        }*/
         //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+//        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, busDeliveredApply);
         if (r == 3) {
@@ -473,13 +472,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             return rb.setMsg(resultBean.getMsg());
         }
         String sid = resultBean.getData();
-        //更改状态
+        //将待出库中的车辆更改状态为出库申请0
         List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(sid);
         for (int i = 0; i < stringList.size(); i++) {
             String vinNo = stringList.get(i);
             busDeliveredService.updateState(vinNo, 0);
         }
-        baseMapper.updateStateBySid(2, sid, DateUtil.date());
+        //更改申请的状态为待审核2
+        baseMapper.updateStateBySid(2, sid);
         String businessSid = resultBean.getData();
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
@@ -498,6 +498,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            if (!voResultBean.getSuccess()) {
+                return rb.setMsg(voResultBean.getMsg());
+            }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             return voResultBean;
@@ -508,8 +511,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 return rb.setMsg("参数错误：instanceId");
             }
             bv.setTaskId(busDeliveredApply.getTaskId());
-            bv.setTaskDefKey(busDeliveredApply.getNodeId());
-            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setTaskDefKey(busDeliveredApply.getTaskDefKey());
+            bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);
         }
@@ -569,7 +572,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 return rb.setMsg(resultBean.getMsg());
             }
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                baseMapper.updateStateBySid(3, bv.getBusinessSid(), DateUtil.date());
+                baseMapper.updateStateBySid(3, bv.getBusinessSid());
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             return rb.success().setData(resultBean.getData());
@@ -635,7 +638,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
                 }
-                baseMapper.updateStateBySid(1, query.getBusinessSid(), DateUtil.date());
+                baseMapper.updateStateBySid(1, query.getBusinessSid());
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
@@ -669,7 +672,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg("操作失败!");
                 }
-                baseMapper.updateStateBySid(1, query.getBusinessSid(), DateUtil.date());
+                baseMapper.updateStateBySid(1, query.getBusinessSid());
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 return rb.success().setData(resultBean.getData());
             }
@@ -702,7 +705,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
                 }
-                baseMapper.updateStateBySid(4, query.getBusinessSid(), DateUtil.date());
+                baseMapper.updateStateBySid(4, query.getBusinessSid());
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 return rb.success().setData(resultBean.getData());
             }
@@ -744,7 +747,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             //根据申请人sid查询分公司sid
             ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(appDeliveredApplyDto.getUserSid());
             if (stringResultBean.getSuccess()) {
-                busDeliveredApply.setOrgSid(stringResultBean.getData());
+                busDeliveredApply.setUseOrgSid(stringResultBean.getData());
             }
             if (carList.size() > 0) {
                 String vin = carList.get(0).getVin();
@@ -756,7 +759,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     busDeliveredService.updateState(vinNo, 0);
                 }
             }
-            baseMapper.updateStateBySid(2, dtoSid, DateUtil.date());
+            baseMapper.updateStateBySid(2, dtoSid);
             busDeliveredApply.setApplySid(sysUserVo.getSid());
             busDeliveredApply.setApplyName(sysUserVo.getName());
             busDeliveredApply.setModelSid(baseVehicle.getModelSid());
@@ -801,16 +804,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 for (AppCarListVo v : voList) {
                     String contractNo = vo.getContractNo();
                     CommonContract commonContract = commonContractFeign.selectByNo(contractNo).getData();
-//                    String customerSid = commonContract.getCustomerSid();
-//                    CrmCustomerTempVo data = crmCustomerTempFeign.fetchSid(customerSid).getData();
                     AppUseInfoVo appUseInfoVo = null;
-//                    if (data != null) {
-//                        appUseInfoVo = new AppUseInfoVo();
-//                        appUseInfoVo.setMobile(data.getMobile());
-//                        appUseInfoVo.setCustomer(data.getName());
-//                        appUseInfoVo.setAddress(data.getAddress());
-//                        appUseInfoVo.setIdNumber(data.getIDNumber());
-//                    }
                     v.setUseInfo(appUseInfoVo);
                 }
             }
@@ -871,7 +865,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             String vinNo = stringList.get(i);
             busDeliveredService.updateState(vinNo, 0);
         }
-        baseMapper.updateStateBySid(2, sid, DateUtil.date());
+        baseMapper.updateStateBySid(2, sid);
         String businessSid = resultBean.getData();
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
@@ -915,7 +909,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 return rb.setMsg("参数错误：instanceId");
             }
             bv.setTaskId(busDeliveredApply.getTaskId());
-            bv.setTaskDefKey(busDeliveredApply.getNodeId());
+            bv.setTaskDefKey(busDeliveredApply.getTaskDefKey());
             bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
             bv.setInstanceId(dto.getInstanceId());
             return complete(bv);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -33,12 +33,12 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
-import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListDto;
-import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarListVo;
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoDto;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.*;
+import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount;
+import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountDto;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.AppUseInfoDto;
 import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage;
+import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -48,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -71,6 +72,8 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     private BaseVehicleFeign baseVehicleFeign;
     @Autowired
     private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
+    @Autowired
+    private BusDeliveredDetailsDiscountService busDeliveredDetailsDiscountService;
 
     private QueryWrapper<BusDeliveredApplyDetails> createQueryWrapper(BusDeliveredApplyDetailsQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -116,10 +119,16 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
     }
 
     public void saveList(List<BusDeliveredApplyDetailsDto> dtoList, String sid) {
+        //删除该出库的车辆以及优惠
+        baseMapper.deleteByApplySid(sid);
+        busDeliveredUseMessageService.deleteByApplySid(sid);
+        busDeliveredDetailsDiscountService.deleteByApplySid(sid);
         for (int i = 0; i < dtoList.size(); i++) {
+            BusDeliveredApplyDetailsDto busDeliveredApplyDetailsDto = dtoList.get(i);
             BusDeliveredApplyDetails busDeliveredApplyDetails = new BusDeliveredApplyDetails();
-            BeanUtil.copyProperties(dtoList.get(i), busDeliveredApplyDetails, "sid");
+            BeanUtil.copyProperties(busDeliveredApplyDetailsDto, busDeliveredApplyDetails, "sid");
             busDeliveredApplyDetails.setApplySid(sid);
+            //保存使用人信息
             if (dtoList.get(i).getUseMessage() != null) {
                 BusDeliveredUseMessage busDeliveredUseMessage = new BusDeliveredUseMessage();
                 BeanUtil.copyProperties(dtoList.get(i).getUseMessage(), busDeliveredUseMessage, "sid");
@@ -128,6 +137,18 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
                 busDeliveredApplyDetails.setUseMessageSid(busDeliveredUseMessage.getSid());
             }
             save(busDeliveredApplyDetails);
+            //保存优惠套餐
+            List<BusDeliveredDetailsDiscountDto> discountList = busDeliveredApplyDetailsDto.getDiscountList();
+            discountList.removeAll(Collections.singleton(null));
+            if (!discountList.isEmpty()) {
+                for (int j = 0; j < discountList.size(); j++) {
+                    BusDeliveredDetailsDiscountDto busDeliveredDetailsDiscountDto = discountList.get(j);
+                    BusDeliveredDetailsDiscount busDeliveredDetailsDiscount = new BusDeliveredDetailsDiscount();
+                    BeanUtil.copyProperties(busDeliveredDetailsDiscountDto, busDeliveredDetailsDiscount, "sid");
+                    busDeliveredDetailsDiscount.setDetailsSid(busDeliveredApplyDetails.getSid());
+                    busDeliveredDetailsDiscountService.insert(busDeliveredDetailsDiscount);
+                }
+            }
         }
     }
 
@@ -137,7 +158,7 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
             AppCarListDto appCarListDto = carList.get(i);
             busDeliveredApplyDetails.setRemarks(appCarListDto.getCarRemarks());
             busDeliveredApplyDetails.setVinNo(appCarListDto.getVin());
-            busDeliveredApplyDetails.setPrice(appCarListDto.getPrice());
+//            busDeliveredApplyDetails.setPrice(appCarListDto.getPrice());
             busDeliveredApplyDetails.setApplySid(sid);
             if (carList.get(i).getUseInfo() != null) {
                 AppUseInfoDto useInfo = carList.get(i).getUseInfo();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/7 8:54
+ * @Description
+ */
+@Mapper
+public interface BusDeliveredDetailsDiscountMapper extends BaseMapper<BusDeliveredDetailsDiscount> {
+    List<OrderDiscountVo> selectBySid(String vinSid);
+
+    int selectCounts(String discountSid);
+
+    /**
+     * 根据出库申请删除优惠信息
+     *
+     * @param sid
+     * @return
+     */
+    int deleteByApplySid(String sid);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountMapper">
+    <select id="selectBySid" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo">
+        select *
+        from bus_delivered_details_discount
+        where detailsSid = #{vinSid}
+    </select>
+
+    <select id="selectCounts" resultType="int">
+        select sum(bd.giveNum)
+        from bus_delivered_details_discount bd
+                 left join bus_delivered_apply_details bad on bad.sid = bd.detailsSid
+                 left join bus_delivered_apply bda on bda.sid = bad.applySid
+        where bd.discountSid = #{discountSid}
+          and (bda.nodeState = '已办结' or bda.nodeState = '销售支持部经理审批')
+    </select>
+
+    <delete id="deleteByApplySid">
+        delete
+        from bus_delivered_details_discount
+        where applySid = #{sid}
+    </delete>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivereddetailsdiscount/BusDeliveredDetailsDiscountService.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount;
+
+import com.yxt.anrui.buscenter.api.busdelivereddetailsdiscount.BusDeliveredDetailsDiscount;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/7 8:53
+ * @Description
+ */
+@Service
+public class BusDeliveredDetailsDiscountService extends MybatisBaseService<BusDeliveredDetailsDiscountMapper, BusDeliveredDetailsDiscount> {
+    public List<OrderDiscountVo> selectBySid(String vinSid) {
+        return baseMapper.selectBySid(vinSid);
+    }
+
+    public int selectCounts(String discountSid) {
+        return baseMapper.selectCounts(discountSid);
+    }
+
+    public int deleteByApplySid(String sid) {
+        return baseMapper.deleteByApplySid(sid);
+    }
+}

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

@@ -3374,10 +3374,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             StringBuilder typeValue = new StringBuilder();
             if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
                 typeValue = typeValue.append("销售类型：" + solutionsDetailsVo.getType());
-            } else {
-                typeValue = typeValue.append("销售类型：" + "-");
+            }else{
+                typeValue = typeValue.append("销售类型：" + appOrderDetailsVo.getPayType());
             }
             list.add(getValueSpanSize(typeValue.toString(), 1, 0, false));
+
             if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey()) && "02".equals(solutionsDetailsVo.getTypeKey())) {
                 list.add(getValueSpanSize("融资项目", 2, 1, true));
                 //厂家贴息

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml

@@ -57,6 +57,6 @@
     </select>
 
     <select id="discountList" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo">
-        select * from bus_sales_order_discount
+        select bd.*,bd.sid discountSid from bus_sales_order_discount bd
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppDiscountInfoDto;
+import com.yxt.anrui.buscenter.biz.busdelivereddetailsdiscount.BusDeliveredDetailsDiscountService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
@@ -65,6 +66,9 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
 
     @Autowired
     private BusSalesOrderService busSalesOrderService;
+    @Autowired
+    private BusDeliveredDetailsDiscountService busDeliveredDetailsDiscountService;
+
 
     public void saveDiscount(List<BusSalesOrderDiscountDto> busSalesOrderDiscountList, String sid) {
         //删除原有的
@@ -174,10 +178,34 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
         return baseMapper.selectDiscount(sid);
     }
 
-    public ResultBean<List<OrderDiscountVo>> discountList(String contractNo,String vinSid) {
+    public ResultBean<List<OrderDiscountVo>> discountList(String contractNo, String vinSid) {
         ResultBean<List<OrderDiscountVo>> rb = ResultBean.fireFail();
-        //查询出库的选择套餐中是否存在
-        List<OrderDiscountVo> list = baseMapper.discountList(contractNo);
+        List<OrderDiscountVo> list = new ArrayList<>();
+        //根据关联的车辆sid查询该条数据的优惠信息bus_deliveredDetails的sid
+        List<OrderDiscountVo> detailsList = busDeliveredDetailsDiscountService.selectBySid(vinSid);
+        detailsList.removeAll(Collections.singleton(null));
+        if (detailsList.isEmpty()) {
+            List<OrderDiscountVo> discountList = baseMapper.discountList(contractNo);
+            for (int i = 0; i < discountList.size(); i++) {
+                OrderDiscountVo discountVo = discountList.get(i);
+                //已使用的数量：根据优惠包sid查询出库已提交以及出库已办结的数量
+                int integerList = busDeliveredDetailsDiscountService.selectCounts(discountVo.getDiscountSid());
+                int num = discountVo.getNum();
+                int surplusNum = num - integerList;
+                discountVo.setSurplusNum(surplusNum);
+                list.add(discountVo);
+            }
+        } else {
+            for (int i = 0; i < detailsList.size(); i++) {
+                OrderDiscountVo discountVo = detailsList.get(i);
+                //已使用的数量：根据优惠包sid查询出库已提交以及出库已办结的数量
+                int integerList = busDeliveredDetailsDiscountService.selectCounts(discountVo.getDiscountSid());
+                int num = discountVo.getNum();
+                int surplusNum = num - integerList;
+                discountVo.setSurplusNum(surplusNum);
+                list.add(discountVo);
+            }
+        }
         return rb.success().setData(list);
     }
 }

anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/fininvoiceapply.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 开票管理列表条件查询
 export function listPage(data) {
   return request({
-    url: '/fin/v1/finginvoiceapply/listPage',
+    url: '/fin/v1/finvehicleinvoice/listPage',
     data,
     method: 'post',
     headers: {
@@ -11,3 +11,24 @@ export function listPage(data) {
     }
   })
 }
+
+// 开票管理--初始化
+export function fetchDetailsBySid(data) {
+  return request({
+    url: '/fin/v1/finvehicleinvoice/fetchSid/' + data,
+    method: 'get'
+  })
+}
+
+// 开票管理--编辑
+export function saveOrUpdate(data) {
+  return request({
+    url: '/fin/v1/finvehicleinvoice/saveOrUpdate',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+

anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@@ -177,13 +177,13 @@ const codemenu = [
     component: Layout,
     redirect: '/finginvoiceapply',
     meta: {
-      title: '开票'
+      title: '开票管理'
     },
     children: [{
       path: '/anruifinmanagement/finginvoiceapply/billingmanagement',
       component: () => import('@/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue'),
       name: 'KaiPiaoGuanLi',
-      meta: { title: '开票', noCache: true }
+      meta: { title: '开票管理', noCache: true }
     }]
   },
   // 费用申请管理编辑

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagement.vue

@@ -9,42 +9,42 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="开票单位">
-                <el-input v-model="listQuery.params.proSchAppNo" placeholder="" clearable style="width: 150px"/>
+                <el-input v-model="listQuery.params.invoiceTitle" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
               <el-form-item label="开票类型">
-                <el-select v-model="listQuery.params.state" placeholder="请选择" clearable style="width: 150px">
-                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                <el-select v-model="listQuery.params.invoiceTypeKey" placeholder="请选择" clearable style="width: 150px">
+                  <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="合同编号">
-                <el-input v-model="listQuery.params.proSchAppNo" placeholder="" clearable style="width: 150px"/>
+                <el-input v-model="listQuery.params.contractNo" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
               <el-form-item label="客户名称">
-                <el-input v-model="listQuery.params.proSchAppNo" placeholder="" clearable style="width: 150px"/>
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
               <el-form-item label="车架号">
-                <el-input v-model="listQuery.params.proSchAppNo" placeholder="" clearable style="width: 150px"/>
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
               <el-form-item label="发票状态">
-                <el-select v-model="listQuery.params.applyTypeKey" placeholder="请选择" clearable style="width: 150px">
-                  <el-option v-for="item in applyType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                <el-select v-model="listQuery.params.billingStateKey" placeholder="请选择" clearable style="width: 150px">
+                  <el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="移交状态">
-                <el-select v-model="listQuery.params.paymentState" placeholder="请选择" clearable style="width: 150px">
-                  <el-option v-for="item in paymentState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                <el-select v-model="listQuery.params.transferStateKey" placeholder="请选择" clearable style="width: 150px">
+                  <el-option v-for="item in invoiceState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="开票名称">
-                <el-input v-model="listQuery.params.proSchAppNo" placeholder="" clearable style="width: 150px"/>
+                <el-input v-model="listQuery.params.invoicingName" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
               <el-form-item label="发票代码">
-                <el-input v-model="listQuery.params.proSchAppNo" placeholder="" clearable style="width: 150px"/>
+                <el-input v-model="listQuery.params.invoiceCode" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
               <el-form-item label="开票日期">
-                <el-date-picker v-model="listQuery.params.subscriptionStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 150px"/>
+                <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 150px"/>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.subscriptionEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 150px"/>
+                <el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 150px"/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -60,78 +60,80 @@
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column fixed label="操作" width="180" align="center">
+            <el-table-column fixed label="操作" width="150" align="center">
               <template slot-scope="scope">
-                <el-button type="success" size="mini" v-show="scope.row.isShowAdopt == 1" @click="toEdit(scope.row)">编辑</el-button>
-                <el-button type="success" size="mini" @click="toInfo(scope.row)">查看</el-button>
+                <el-button type="primary" size="mini" v-show="scope.row.billingState !== '作废' && scope.row.transferState !== '已移交'" @click="toEdit(scope.row)">编辑</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
             <el-table-column label="发票状态" width="100px" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.state }}</span>
+                <span>{{ scope.row.billingState }}</span>
               </template>
             </el-table-column>
             <el-table-column label="交接状态" width="100px" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.state }}</span>
+                <span>{{ scope.row.transferState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="业务状态" width="100px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.businessState }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票单位" align="center" width="200px">
               <template slot-scope="scope">
-                <span>{{ scope.row.proSchAppNo }}</span>
+                <span>{{ scope.row.invoiceTitle }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票类型" align="center" width="200px">
               <template slot-scope="scope">
-                <span>{{ scope.row.applyType }}</span>
+                <span>{{ scope.row.invoiceType }}</span>
               </template>
             </el-table-column>
             <el-table-column label="合同编号" header-align="center" align="left" width="150px">
               <template slot-scope="scope">
-                <span>{{ scope.row.paymentMoney }}</span>
+                <span>{{ scope.row.contractNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="客户名称" align="center" width="100px">
               <template slot-scope="scope">
-                <span>{{ scope.row.paymentState }}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="车架号" align="center" width="100px">
               <template slot-scope="scope">
-                <span>{{ scope.row.subscriptionDate }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票名称" align="center" width="120px">
               <template slot-scope="scope">
-                <span>{{ scope.row.subscriptionPeo }}</span>
+                <span>{{ scope.row.invoicingName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票金额" align="center" width="120px">
               <template slot-scope="scope">
-                <span>{{ scope.row.subscriptionPeo }}</span>
+                <span>{{ scope.row.invoiceAmount }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票日期" align="center" width="120px">
               <template slot-scope="scope">
-                <span>{{ scope.row.subscriptionPeo }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
             <el-table-column label="发票代码" align="center" width="120px">
               <template slot-scope="scope">
-                <span>{{ scope.row.subscriptionPeo }}</span>
+                <span>{{ scope.row.invoiceCode }}</span>
               </template>
             </el-table-column>
             <el-table-column label="发票号" align="center" min-width="120px">
               <template slot-scope="scope">
-                <span>{{ scope.row.subscriptionPeo }}</span>
+                <span>{{ scope.row.invoiceNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="发票图片" align="center" width="180px" class-name="small-padding">
+            <el-table-column label="发票图片" align="center" width="100px" class-name="small-padding">
               <template slot-scope="scope">
                 <el-button size="mini" v-show="scope.row.witMatUrl !== ''" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
-                <div class="upload_img" v-show="scope.row.isShowAdopt == 1">
-                  <FileUpload ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="getList" :upload-data="{type:'0001',sid: scope.row.sid}"></FileUpload>
-                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -143,11 +145,11 @@
       </div>
     </div>
     <!-- End 列表页面 -->
-    <billingmanagementAdd v-show="viewState == 2" ref="divAdd" @doback="reseaState" @readlist="getList"/>
+    <billingmanagementAdd v-show="viewState == 2" ref="divAdd" @doback="reseaState" @reloadlist="getList"/>
     <billingmanagementInfo v-show="viewState == 3" ref="divInfo" @doback="reseaState"/>
     <!-- 照片弹窗 -->
     <el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
-      <img width="100%" :src="dialogImageUrl" alt="" />
+      <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
   </div>
 </template>
@@ -158,7 +160,6 @@ import { getOrgSidByPath, typeValues } from '@/api/jichuxinxi/dictcommons'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import FileUpload from '@/components/uploadFile/FileUpload'
 import billingmanagementAdd from './billingmanagementAdd'
 import billingmanagementInfo from './billingmanagementInfo'
 
@@ -167,7 +168,6 @@ export default {
   components: {
     Pagination,
     pageye,
-    FileUpload,
     ButtonBar,
     billingmanagementAdd,
     billingmanagementInfo
@@ -193,49 +193,30 @@ export default {
       tableKey: 0,
       list: [],
       srcList: [],
-      state_list: [
-        {
-          dictKey: 0,
-          dictValue: '未认款'
-        },
-        {
-          dictKey: 1,
-          dictValue: '已认款'
-        }
-      ],
-      paymentState_list: [
-        {
-          dictKey: 0,
-          dictValue: '未打款'
-        },
-        {
-          dictKey: 1,
-          dictValue: '已打款'
-        },
-        {
-          dictKey: 2,
-          dictValue: '无需打款'
-        }
-      ],
-      applyType_list: [],
+      invoiceType_list: [],
+      state_list: [],
+      invoiceState_list: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
         params: {
-          state: 0,
-          paymentState: '',
-          subscriptionStartDate: '',
-          subscriptionEndDate: '',
-          proSchAppNo: '',
-          applyTypeKey: '',
+          invoiceTitle: '',
+          invoiceTypeKey: '',
+          contractNo: '',
+          customerName: '',
+          vinNo: '',
+          billingStateKey: '',
+          transferStateKey: '',
+          invoicingName: '',
+          invoiceCode: '',
+          createStartTime: '',
+          createEndTime: '',
           createOrgSid: ''
         },
         current: 1,
         size: 10,
         total: 0
       },
-      dialogImageUrl: '',
-      imgList: [],
       rules: {}
     }
   },
@@ -268,9 +249,19 @@ export default {
       }
     },
     init() {
-      typeValues({ type: 'applyType' }).then((resp) => {
+      typeValues({ type: 'invoiceType' }).then((resp) => {
+        if (resp.success) {
+          this.invoiceType_list = resp.data
+        }
+      })
+      typeValues({ type: 'transferState' }).then((resp) => {
+        if (resp.success) {
+          this.invoiceState_list = resp.data
+        }
+      })
+      typeValues({ type: 'billingState' }).then((resp) => {
         if (resp.success) {
-          this.applyType_list = resp.data
+          this.state_list = resp.data
         }
       })
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
@@ -289,18 +280,18 @@ export default {
     },
     // 查询列表信息
     getList() {
-      // this.listLoading = true
-      // listPage(this.listQuery).then((response) => {
-      //   console.log('列表查询结果：', response)
-      //   this.listLoading = false
-      //   if (response.success) {
-      //     this.list = response.data.records
-      //     this.listQuery.total = response.data.total
-      //   } else {
-      //     this.list = []
-      //     this.listQuery.total = 0
-      //   }
-      // })
+      this.listLoading = true
+      listPage(this.listQuery).then((response) => {
+        console.log('列表查询结果：', response)
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
     },
     // 查询按钮
     handleFilter() {
@@ -310,12 +301,17 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          state: 0,
-          paymentState: '',
-          subscriptionStartDate: '',
-          subscriptionEndDate: '',
-          proSchAppNo: '',
-          applyTypeKey: '',
+          invoiceTitle: '',
+          invoiceTypeKey: '',
+          contractNo: '',
+          customerName: '',
+          vinNo: '',
+          billingStateKey: '',
+          transferStateKey: '',
+          invoicingName: '',
+          invoiceCode: '',
+          createStartTime: '',
+          createEndTime: '',
           createOrgSid: ''
         },
         current: 1,
@@ -334,7 +330,7 @@ export default {
     },
     handleGetCheck(row) {
       this.dialogImgVisible = true
-      this.dialogImageUrl = row.witMatUrl
+      this.srcList = row.filePaths
     },
     reseaState() {
       this.viewState = 1

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementAdd.vue

@@ -12,45 +12,45 @@
     </div>
     <div class="listconadd">
       <div class="titwu">发票信息</div>
-      <el-form ref="form_obj" v-model="formobj" :rules="rules" class="formaddcopy02">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="24">
             <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceTitle }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">车架号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <div class="span-sty">开票类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceType }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">开票金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceAmount }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">开票状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.billingState }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">开票名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoicingName }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -60,17 +60,17 @@
           </el-col>
           <el-col :span="12">
             <div class="span-sty">开票日期</div>
-            <el-form-item><el-date-picker v-model="formobj.name" class="addinputw" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
+            <el-form-item><el-date-picker v-model="formobj.createTime" class="addinputw" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <div class="span-sty">发票号</div>
-            <el-form-item><el-input v-model="formobj.name" clearable class="addinputw" /></el-form-item>
+            <el-form-item><el-input v-model="formobj.invoiceNo" clearable class="addinputw" /></el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">发票代码</div>
-            <el-form-item><el-input v-model="formobj.name" clearable class="addinputw" /></el-form-item>
+            <el-form-item><el-input v-model="formobj.invoiceCode" clearable class="addinputw" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -87,11 +87,11 @@
 </template>
 
 <script>
-import { listPage } from '@/api/anruifinmanagement/fininvoiceapply'
+import { fetchDetailsBySid, saveOrUpdate } from '@/api/anruifinmanagement/fininvoiceapply'
 import upload from '@/components/uploadFile/upload'
 
 export default {
-  name: '',
+  name: 'billingmanagementAdd',
   components: {
     upload
   },
@@ -101,16 +101,94 @@ export default {
       submitdisabled: false,
       diploma_list: [],
       accept: '.jpg,.jpeg,.png,.JPG,.JPEG',
-      formobj: {},
+      formobj: {
+        sid: '',
+        invoiceTitle: '',
+        contractNo: '',
+        customerName: '',
+        invoiceType: '',
+        invoiceAmount: '',
+        billingState: '',
+        invoicingName: '',
+        name: '',
+        createTime: '',
+        invoiceNo: '',
+        invoiceCode: '',
+        filePaths: [],
+        vinNo: ''
+      },
       rules: {}
     }
   },
   methods: {
     showEdit(row) {
       this.viewTitle = '【编辑】发票信息'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      fetchDetailsBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filePaths.length > 0) {
+            for (var i = 0; i < this.formobj.filePaths.length; i++) {
+              this.diploma_list.push({
+                name: '',
+                url: this.formobj.filePaths[i]
+              })
+            }
+          }
+        }
+      })
+    },
+    handleSave() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.getUrl()
+          this.submitdisabled = true
+          saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    getUrl() {
+      if (this.diploma_list.length > 0) {
+        const aa = []
+        for (var i = 0; i < this.diploma_list.length; i++) {
+          aa.push(this.diploma_list[i].url)
+        }
+        this.formobj.filePaths = aa
+      }
+      console.log(this.formobj, this.diploma_list)
     },
-    handleSave() {},
-    handleReturn() {
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        sid: '',
+        invoiceTitle: '',
+        contractNo: '',
+        customerName: '',
+        invoiceType: '',
+        invoiceAmount: '',
+        billingState: '',
+        invoicingName: '',
+        name: '',
+        createTime: '',
+        invoiceNo: '',
+        invoiceCode: '',
+        filePaths: [],
+        vinNo: ''
+      }
+      this.diploma_list = []
+      this.submitdisabled = false
+      this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }
   }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/billingmanagement/billingmanagementInfo.vue

@@ -14,41 +14,41 @@
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="24">
             <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceTitle }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">车架号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <div class="span-sty">开票类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceType }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">开票金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceAmount }}</span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">开票状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.state }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">开票名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoicingName }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -58,23 +58,27 @@
           </el-col>
           <el-col :span="12">
             <div class="span-sty">开票日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <div class="span-sty">发票号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceNo }}</span></el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty">发票代码</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">{{ formobj.invoiceCode }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <div class="span-sty">发票照片</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.name }}</span></el-form-item>
+            <el-form-item>
+              <div class="addinputInfo">
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="formobj.filePaths"></el-image>
+              </div>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -83,20 +87,40 @@
 </template>
 
 <script>
-import { listPage } from '@/api/anruifinmanagement/fininvoiceapply'
+import { fetchDetailsBySid } from '@/api/anruifinmanagement/fininvoiceapply'
 
 export default {
-  name: '',
+  name: 'billingmanagementInfo',
   data() {
     return {
       viewTitle: '',
-      formobj: {},
+      formobj: {
+        sid: '',
+        invoiceTitle: '',
+        contractNo: '',
+        customerName: '',
+        invoiceType: '',
+        invoiceAmount: '',
+        state: '',
+        invoicingName: '',
+        name: '',
+        createTime: '',
+        invoiceNo: '',
+        invoiceCode: '',
+        filePaths: [],
+        vinNo: ''
+      },
       rules: {}
     }
   },
   methods: {
     showInfo(row) {
       this.viewTitle = '发票信息'
+      fetchDetailsBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
     },
     handleReturn() {
       this.$emit('doback')

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

@@ -8,19 +8,36 @@ import lombok.Data;
 public class AppVinListDto implements Dto {
     private static final long serialVersionUID = 1941205415631089700L;
 
-    @ApiModelProperty("车架号")
-    private String VIN;
-
-    @ApiModelProperty("开票名称")
-    private String invoiceName;
+    private String sid; // sid
 
+    @ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+    @ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+    @ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+    @ApiModelProperty("挂靠公司sid")
+    private String billNameSid; // 挂靠公司sid
+    @ApiModelProperty("挂靠公司名称")
+    private String billName; // 挂靠公司名称
+    @ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
+
+    @ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
     @ApiModelProperty("开票名称")
-    private String invoiceNameKey;
-
-    @ApiModelProperty("开票类型")
-    private String billTypeValue;
-
-    @ApiModelProperty("开票类型")
-    private String billTypeKey;
+    private String openTickName; // 开票名称
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+    @ApiModelProperty("开票信息")
+    private String openTickRemarks; // 开票信息
 
 }

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

@@ -70,10 +70,6 @@ public class FinBillApplication extends BaseEntity {
     private BigDecimal oneBillMoney; // 单台开票金额
 	@ApiModelProperty("开票金额合计")
     private BigDecimal totalBillMoney; // 开票金额合计
-	@ApiModelProperty("开票状态")
-    private String billState; // 开票状态
-    @ApiModelProperty("开票状态")
-    private String billStateKey;// 开票状态key
     @ApiModelProperty("车辆总台数")
     private Integer num; // 车辆总台数
     @ApiModelProperty("申请日期")
@@ -96,4 +92,52 @@ public class FinBillApplication extends BaseEntity {
     @ApiModelProperty(value = "当前用户部门全路径")
     private String orgSidPath;
 
+    @ApiModelProperty(value = "发起部门sid")
+    private String deptSid;
+    @ApiModelProperty(value = "发起部门名称")
+    private String deptName;
+    @ApiModelProperty(value = "销售专员sid")
+    private String staffSid;
+    @ApiModelProperty(value = "销售专员名称")
+    private String staffName;
+    @ApiModelProperty(value = "销售部门sid")
+    private String saleDeptSid;
+    @ApiModelProperty(value = "销售部门名称")
+    private String saleDeptName;
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
+    @ApiModelProperty(value = "销售类型value")
+    private String saleTypeValue;
+    @ApiModelProperty(value = "开票单位sid")
+    private String openTickUnitSid;
+    @ApiModelProperty(value = "开票单位名称")
+    private String openTickUnitName;
+    @ApiModelProperty(value = "是否领取发票原件")
+    private String isLQOrigInvoice;
+    @ApiModelProperty(value = "开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty(value = "开票类型value")
+    private String openTickTypeValue;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
+    @ApiModelProperty(value = "欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty(value = "承诺回款日期")
+    private String returnedMoneyDate;
+    @ApiModelProperty(value = "欠款开票原因key")
+    private String arrearsOpenYYKey;
+    @ApiModelProperty(value = "欠款开票原因value")
+    private String arrearsOpenYYValue;
+    @ApiModelProperty("开票状态Value")
+    private String billStateValue; // 开票状态Value
+    @ApiModelProperty("开票状态key")
+    private String billStateKey;// 开票状态key
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    @ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
 }

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

@@ -28,6 +28,8 @@ package com.yxt.anrui.fin.api.finbillapplication;
 
 import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
 import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
 import com.yxt.common.core.vo.Vo;
@@ -75,8 +77,6 @@ public class FinBillApplicationDetailsVo implements Vo {
     private String oneBillState; // 单台开票状态
 	@ApiModelProperty("开票金额合计")
     private String totalBillMoney; // 开票金额合计
-	@ApiModelProperty("开票状态")
-    private String billState; // 开票状态
     @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
     @ApiModelProperty("开票公共表sid")
@@ -85,8 +85,64 @@ public class FinBillApplicationDetailsVo implements Vo {
     private String remarks; // 备注
     @ApiModelProperty(value = "是否延迟开票")
     private Integer isDelayBill;
+
+    @ApiModelProperty(value = "发起部门sid")
+    private String deptSid;
+    @ApiModelProperty(value = "发起部门名称")
+    private String deptName;
+    @ApiModelProperty(value = "销售专员sid")
+    private String staffSid;
+    @ApiModelProperty(value = "销售专员名称")
+    private String staffName;
+    @ApiModelProperty(value = "销售部门sid")
+    private String saleDeptSid;
+    @ApiModelProperty(value = "销售部门名称")
+    private String saleDeptName;
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
+    @ApiModelProperty(value = "销售类型value")
+    private String saleTypeValue;
+    @ApiModelProperty(value = "开票单位sid")
+    private String openTickUnitSid;
+    @ApiModelProperty(value = "开票单位名称")
+    private String openTickUnitName;
+    @ApiModelProperty(value = "是否领取发票原件")
+    private String isLQOrigInvoice;
+    @ApiModelProperty(value = "开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty(value = "开票类型value")
+    private String openTickTypeValue;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
+    @ApiModelProperty(value = "欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty(value = "承诺回款日期")
+    private String returnedMoneyDate;
+    @ApiModelProperty(value = "欠款开票原因key")
+    private String arrearsOpenYYKey;
+    @ApiModelProperty(value = "欠款开票原因value")
+    private String arrearsOpenYYValue;
+    @ApiModelProperty("开票状态Value")
+    private String billStateValue; // 开票状态Value
+    @ApiModelProperty("开票状态key")
+    private String billStateKey;// 开票状态key
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    @ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息
-    @ApiModelProperty("附件信息")
-    private List<FinBillFileVo> finBillFileVos; // 附件信息
+    @ApiModelProperty("开票挂车信息")
+    private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
+    @ApiModelProperty("客户开票申请书")
+    private List<FinBillFileVo> khkpsqsApplicationAppendxs; // 客户开票申请书
+    @ApiModelProperty("开票信息确认书")
+    private List<FinBillFileVo> kpxxqrsApplicationAppendxs; // 开票信息确认书
+    @ApiModelProperty("车辆登记合同")
+    private List<FinBillFileVo> cldjhtApplicationAppendxs; // 车辆登记合同
 }

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

@@ -27,6 +27,9 @@ package com.yxt.anrui.fin.api.finbillapplication;
 
 
 import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
+import com.yxt.anrui.fin.api.finbillfile.FinBillFileDtos;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.common.core.dto.Dto;
 
@@ -34,6 +37,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -55,10 +59,10 @@ public class FinBillApplicationDto implements Dto {
 
     private String sid; // sid
 
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
     @ApiModelProperty("userSid")
     private String userSid; // userSid
-    @ApiModelProperty("业务员sid")
-    private String staffSid; // 业务员sid
 	@ApiModelProperty("创建人接口")
     private String createByName; // 创建人接口
 	@ApiModelProperty("合同sid")
@@ -75,10 +79,6 @@ public class FinBillApplicationDto implements Dto {
     private String totalBillMoney; // 开票金额合计
     @ApiModelProperty("申请日期")
     private String applyDate; // 申请日期
-	@ApiModelProperty("开票状态")
-    private String billState; // 开票状态
-    @ApiModelProperty("开票公共表sid")
-    private String billAppPublicSid; // 开票公共表sid
     @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("环节定义的sid")
@@ -95,12 +95,64 @@ public class FinBillApplicationDto implements Dto {
     private String remarks; // 备注
     @ApiModelProperty("当前用户部门全路径")
     private String orgSidPath;
+
+    @ApiModelProperty(value = "发起部门sid")
+    private String deptSid;
+    @ApiModelProperty(value = "发起部门名称")
+    private String deptName;
+    @ApiModelProperty(value = "销售专员sid")
+    private String staffSid;
+    @ApiModelProperty(value = "销售专员名称")
+    private String staffName;
+    @ApiModelProperty(value = "销售部门sid")
+    private String saleDeptSid;
+    @ApiModelProperty(value = "销售部门名称")
+    private String saleDeptName;
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
+    @ApiModelProperty(value = "销售类型value")
+    private String saleTypeValue;
+    @ApiModelProperty(value = "开票单位sid")
+    private String openTickUnitSid;
+    @ApiModelProperty(value = "开票单位名称")
+    private String openTickUnitName;
+    @ApiModelProperty(value = "是否领取发票原件")
+    private String isLQOrigInvoice;
+    @ApiModelProperty(value = "开票类型key")
+    private String openTickTypeKey;
+    @ApiModelProperty(value = "开票类型value")
+    private String openTickTypeValue;
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
+    @ApiModelProperty(value = "欠款金额")
+    private String arrearsMoney;
+    @ApiModelProperty(value = "承诺回款日期")
+    private String returnedMoneyDate;
+    @ApiModelProperty(value = "欠款开票原因key")
+    private String arrearsOpenYYKey;
+    @ApiModelProperty(value = "欠款开票原因value")
+    private String arrearsOpenYYValue;
+    @ApiModelProperty("开票状态Value")
+    private String billStateValue; // 开票状态Value
+    @ApiModelProperty("开票状态key")
+    private String billStateKey;// 开票状态key
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+    @ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleDto> finBillVehicles; // 开票车辆信息
+    @ApiModelProperty("开票挂车信息")
+    private List<FinBillTrailerDto> finBillTrailers; // 开票挂车信息
     @ApiModelProperty("客户开票申请书附件信息")
-    private List<FinBillApplicationAppendxDto> khkpsqsApplicationAppendxs; // 客户开票申请书附件信息
+    private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
     @ApiModelProperty("开票信息确认书附件信息")
-    private List<FinBillApplicationAppendxDto> kpxxqrsApplicationAppendxs; // 开票信息确认书附件信息
+    private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
     @ApiModelProperty("车辆登记合同附件信息")
-    private List<FinBillApplicationAppendxDto> cldjhtApplicationAppendxs; // 车辆登记合同附件信息
+    private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
 }

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

@@ -80,40 +80,10 @@ public interface FinBillApplicationFeign {
 
     /*************************流程管理接口********************************/
 
-   /* @ApiOperation("列表提交开票申请审批流程")
-    @PostMapping("/submitFinBillApplicationPageList")
-    public ResultBean submitFinBillApplicationPageList(@RequestBody @Valid SubmitFinBillApplicationPageListDto dto);
-*/
     @ApiOperation("提交开票申请审批流程")
     @PostMapping("/submitFinBillApplication")
     public ResultBean submitFinBillApplication(@RequestBody @Valid SubmitFinBillApplicationDto dto);
 
-   /* @ApiOperation(value = "办理（同意）")
-    @PostMapping("/complete")
-    public ResultBean complete(@ApiParam(value = "变量集合,json对象") @RequestBody Map<String, Object> variables);
-
-    @ApiOperation(value = "撤回流程")
-    @PostMapping(value = "/revokeProcess/{userSid}/{businessSid}")
-    public ResultBean revokeProcess(
-            @ApiParam(value = "用户sid") @PathVariable(value = "userSid")String userSid,
-            @ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid,
-            @ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo) ;
-
-    @ApiOperation(value = "驳回任务")
-    @PostMapping(value = "/reject/{businessSid}")
-    public ResultBean taskReject(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid,
-                                 @ApiParam(value = "工作流任务相关--请求参数")@RequestBody FlowTaskVo flowTaskVo);
-
-    @ApiOperation(value = "终止任务")
-    @PostMapping(value = "/breakProcess/{businessSid}")
-    public ResultBean breakProcess(@ApiParam(value = "业务sid") @PathVariable(value = "businessSid")String businessSid,
-                                   @RequestBody FlowTaskVo flowTaskVo);
-
-    @ApiOperation(value = "流程历史流转记录" )
-    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
-    public ResultBean flowRecord( @ApiParam(value = "流程实例id")@PathVariable(value = "procInsId")String procInsId,
-                                  @ApiParam(value = "目前没用")@PathVariable(value = "deployId")String deployId);*/
-
     @ApiOperation("提交开票申请审批流程")
     @PostMapping("/submitBillApplication")
     public ResultBean submitBillApplication(@RequestBody @Valid SubmitBillApplicationDto dto);

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

@@ -49,25 +49,24 @@ import lombok.Data;
 @ApiModel(value = "开票申请表 查询条件", description = "开票申请表 查询条件")
 public class FinBillApplicationQuery implements Query {
 
-    @ApiModelProperty("业务员sid")
-    private String staffSid; // 业务员sid
-	@ApiModelProperty("创建人接口")
-    private String createByName; // 创建人接口
-	@ApiModelProperty("分公司sid")
+    @ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty(value = "开票单位名称")
+    private String openTickUnitName;
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-    @ApiModelProperty("开票类型key")
-    private String billTypeKey; // 开票类型key
-    @ApiModelProperty("挂靠公司名称")
-    private String billName; // 挂靠公司名称
+    @ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+    @ApiModelProperty("开票状态key")
+    private String billStateKey;// 开票状态key
+    @ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
     @ApiModelProperty("申请开始日期")
     private String applyStartDate; // 申请开始日期
     @ApiModelProperty("申请结束日期")
     private String applyEndDate; // 申请结束日期
-	@ApiModelProperty("开票状态")
-    private String billState; // 开票状态
-
 }

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

@@ -50,41 +50,24 @@ import lombok.Data;
 public class FinBillApplicationVo implements Vo {
 
     private String sid; // sid
-
-	@ApiModelProperty("创建人接口")
-    private String createByName; // 创建人接口
-	@ApiModelProperty("分公司sid")
-    private String useOrgSid; // 分公司sid
-	@ApiModelProperty("合同sid")
-    private String contractSid; // 合同sid
-	@ApiModelProperty("合同编号")
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
+    @ApiModelProperty(value = "销售类型value")
+    private String saleTypeValue;
+    @ApiModelProperty("合同编号")
     private String contractNo; // 合同编号
-	@ApiModelProperty("客户sid")
-    private String customerSid; // 客户sid
-	@ApiModelProperty("客户名称")
+    @ApiModelProperty(value = "开票单位名称")
+    private String openTickUnitName;
+    @ApiModelProperty("客户名称")
     private String customerName; // 客户名称
-	@ApiModelProperty("单台开票金额")
-    private String oneBillMoney; // 单台开票金额
-	@ApiModelProperty("开票金额合计")
-    private String totalBillMoney; // 开票金额合计
-	@ApiModelProperty("开票状态")
-    private String billState; // 开票状态
-    @ApiModelProperty("开票公共表sid")
-    private String billAppPublicSid; // 开票公共表sid
-    @ApiModelProperty("流程定义的id")
-    private String procDefId;
-    @ApiModelProperty("环节定义的sid")
-    private String nodeSid;
-    @ApiModelProperty("流程实例的sid")
-    private String procInstSid;
     @ApiModelProperty("车辆总台数")
     private Integer num;
+    @ApiModelProperty("开票状态Value")
+    private String billStateValue; // 开票状态Value
+    @ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
     @ApiModelProperty("申请日期")
     private String applyDate;
-    @ApiModelProperty(value = "节点状态")
-    private String nodeState;
-    @ApiModelProperty(value = "是否高低开")
-    private String isHighAndLowOpen;
-    @ApiModelProperty(value = "是否延迟开票")
-    private String isDelayBill;
+    @ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
 }

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

@@ -13,18 +13,12 @@ import lombok.Data;
  */
 @ApiModel("提交")
 @Data
-public class SubmitFinBillApplicationDto extends AppBillApplicationIInfoDto {
-
-    private static final long serialVersionUID = 315255996193475787L;
-/*    @ApiModelProperty("业务sid")
-    private String businessSid;*/
+public class SubmitFinBillApplicationDto extends FinBillApplicationDto {
 
     @ApiModelProperty("意见")
     private String comment;
-
     @ApiModelProperty("流程实例id")
     private String instanceId;
-
     @ApiModelProperty("任务id")
     private String taskId;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinAttachTypeEnum.java

@@ -0,0 +1,36 @@
+package com.yxt.anrui.fin.api.finbillfile;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/12 10:13
+ * @Description 附件类型枚举
+ */
+public enum FinAttachTypeEnum {
+
+    KHKPSQS("001", "客户开票申请书"),
+    KPXXQRS("002", "开票信息确认书"),
+    CLDJHT("002", "车辆登记合同");
+
+    /**
+     * 附件类型
+     */
+    private final String attachType;
+
+    /**
+     * 代号
+     */
+    private final String mark;
+
+    FinAttachTypeEnum(String attachType, String mark) {
+        this.attachType = attachType;
+        this.mark = mark;
+    }
+
+    public String getAttachType() {
+        return attachType;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFile.java

@@ -60,4 +60,6 @@ public class FinBillFile extends BaseEntity {
     private String fileSid; // 附件sid
     @ApiModelProperty("附件路径")
     private String fileUrl; // 附件路径
+    @ApiModelProperty("附件类型")
+    private String attachType; // 附件类型
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDto.java

@@ -61,4 +61,6 @@ public class FinBillFileDto implements Dto {
     private String fileSid; // 附件sid
     @ApiModelProperty("附件路径")
     private String fileUrl; // 附件路径
+    @ApiModelProperty("附件类型")
+    private String attachType; // 附件类型
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileDtos.java

@@ -0,0 +1,44 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbillfile;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "开票附件关联表 数据传输对象", description = "开票附件关联表 数据传输对象")
+public class FinBillFileDtos implements Dto {
+
+    @ApiModelProperty("名称")
+    private String name; // 名称
+    @ApiModelProperty("客户开票申请书附件信息")
+    private List<FinBillFileDto> finBillFileDtos = new ArrayList<>(); // 客户开票申请书附件信息
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/cldjht.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.fin.api.finbillfile;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class cldjht {
+
+    @ApiModelProperty("名称")
+    private String name; // 名称
+    @ApiModelProperty("车辆登记合同附件信息")
+    private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/khkpsqs.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.fin.api.finbillfile;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class khkpsqs {
+
+    @ApiModelProperty("名称")
+    private String name; // 名称
+    @ApiModelProperty("客户开票申请书附件信息")
+    private List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/kpxxqrs.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.fin.api.finbillfile;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class kpxxqrs {
+
+    @ApiModelProperty("名称")
+    private String name; // 名称
+    @ApiModelProperty("开票信息确认书附件信息")
+    private List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailer.java

@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbilltrailer;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailer.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer <br/>
+ * Description: 开票挂车信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票挂车信息表", description = "开票挂车信息表")
+@TableName("fin_bill_trailer")
+public class FinBillTrailer extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+	@ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("单台开票金额")
+    private BigDecimal oneBillMoney; // 单台开票金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbilltrailer;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo <br/>
+ * Description: 开票挂车信息表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票挂车信息表 视图数据详情", description = "开票挂车信息表 视图数据详情")
+public class FinBillTrailerDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+	@ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDto.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbilltrailer;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerDto.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto <br/>
+ * Description: 开票挂车信息表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票挂车信息表 数据传输对象", description = "开票挂车信息表 数据传输对象")
+public class FinBillTrailerDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+	@ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbilltrailer;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerFeign.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign <br/>
+ * Description: 开票挂车信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票挂车信息表")
+@FeignClient(
+        contextId = "anrui-fin-FinBillTrailer",
+        name = "anrui-fin",
+        path = "v1/finbilltrailer",
+        fallback = FinBillTrailerFeignFallback.class)
+public interface FinBillTrailerFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<FinBillTrailerVo>> listPage(@RequestBody PagerQuery<FinBillTrailerQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody FinBillTrailerDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<FinBillTrailerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbilltrailer;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeignFallback <br/>
+ * Description: 开票挂车信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class FinBillTrailerFeignFallback implements FinBillTrailerFeign {
+
+	@Override
+	public ResultBean<PagerVo<FinBillTrailerVo>> listPage(PagerQuery<FinBillTrailerQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbilltrailer/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(FinBillTrailerDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbilltrailer/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-fin/finbilltrailer/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<FinBillTrailerDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-fin/finbilltrailer/fetchDetailsBySid无法访问");
+	}
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerQuery.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbilltrailer;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerQuery.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerQuery <br/>
+ * Description: 开票挂车信息表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票挂车信息表 查询条件", description = "开票挂车信息表 查询条件")
+public class FinBillTrailerQuery implements Query {
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+	@ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.finbilltrailer;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo <br/>
+ * Description: 开票挂车信息表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "开票挂车信息表 视图数据对象", description = "开票挂车信息表 视图数据对象")
+public class FinBillTrailerVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("主车车架号")
+    private String vinNo; // 主车车架号
+	@ApiModelProperty("挂车车架号")
+    private String gcVinNo; // 挂车车架号
+	@ApiModelProperty("开票类型key")
+    private String billTypeKey; // 开票类型key
+	@ApiModelProperty("开票类型value")
+    private String billTypeValue; // 开票类型value
+	@ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+	@ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+	@ApiModelProperty("开票申请单sid")
+    private String billAppSid; // 开票申请单sid
+	@ApiModelProperty("单台开票金额")
+    private String oneBillMoney; // 单台开票金额
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicle.java

@@ -67,4 +67,15 @@ public class FinBillVehicle extends BaseEntity {
 	@ApiModelProperty("开票申请单sid")
     private String billAppSid; // 开票申请单sid
 
+    @ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+    @ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+    @ApiModelProperty("开票信息")
+    private String openTickRemarks; // 开票信息
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java

@@ -57,8 +57,7 @@ public class FinBillVehicleDto implements Dto {
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("车架号")
-    @JsonProperty("VIN")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 	@ApiModelProperty("开票类型key")
     private String billTypeKey; // 开票类型key
 	@ApiModelProperty("开票类型value")
@@ -71,4 +70,15 @@ public class FinBillVehicleDto implements Dto {
     private String billAppSid; // 开票申请单sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
+
+    @ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+    @ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+    @ApiModelProperty("开票信息")
+    private String openTickRemarks; // 开票信息
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleVo.java

@@ -57,8 +57,7 @@ public class FinBillVehicleVo implements Vo {
 	@ApiModelProperty("分公司sid")
     private String useOrgSid; // 分公司sid
 	@ApiModelProperty("车架号")
-    @JsonProperty("VIN")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 	@ApiModelProperty("开票类型key")
     private String billTypeKey; // 开票类型key
 	@ApiModelProperty("开票类型value")
@@ -71,4 +70,15 @@ public class FinBillVehicleVo implements Vo {
     private String billAppSid; // 开票申请单sid
     @ApiModelProperty("备注")
     private String remarks; // 备注
+
+    @ApiModelProperty("开票名称sid")
+    private String openTickSid; // 开票名称sid
+    @ApiModelProperty("开票名称")
+    private String openTickName; // 开票名称
+    @ApiModelProperty("合格证状态key")
+    private String certificateStateKey; // 合格证状态key
+    @ApiModelProperty("合格证状态value")
+    private String certificateStateValue; // 合格证状态value
+    @ApiModelProperty("开票信息")
+    private String openTickRemarks; // 开票信息
 }

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

@@ -69,4 +69,6 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     IPage<AppBillApplicationPageVo> getInvoicedApplyList(IPage<AppBillApplicationPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBillApplicationPageVo> qw, @Param("name") String name);
 
     AppBillApplicationIInfoVo getInvoicedApply(@Param("sid") String sid);
+
+    String selectNum(String bill);
 }

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

@@ -8,14 +8,16 @@
         *
         FROM
         fin_bill_application fba
-        LEFT JOIN fin_bill_vehicle fbv
-        ON fba.`sid` = fbv.`billAppSid`
-        <where>${ew.sqlSegment}</where>
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo">
         SELECT * FROM fin_bill_application
-        <where>${ew.sqlSegment}</where>
+        <where>
+            ${ew.sqlSegment}
+        </where>
     </select>
 
     <select id="getInvoicedApplyList"
@@ -66,4 +68,12 @@
         </if>
         WHERE sid=#{sid}
     </update>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from fin_bill_application
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+                limit 1
+    </select>
 </mapper>

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

@@ -30,12 +30,19 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
+import com.yxt.anrui.base.api.basetrailer.TrailerVo;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
 import com.yxt.anrui.base.api.commonappendix.*;
 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.DictCommonEnum;
 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.busadvanceginvoiceapply.AdCarListDto;
 import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.BusAdvanceGinvoiceapply;
 import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleDetailsVo;
@@ -51,14 +58,16 @@ import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeVo;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillTaskQuery;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic;
 import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto;
-import com.yxt.anrui.fin.api.finbillfile.FinBillFile;
-import com.yxt.anrui.fin.api.finbillfile.FinBillFileAppendxVo;
-import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
+import com.yxt.anrui.fin.api.finbillfile.*;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
 import com.yxt.anrui.fin.biz.finbillapplicationpublic.FinBillApplicationPublicService;
 import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService;
+import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService;
 import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -114,6 +123,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     @Autowired
     private FinBillVehicleService finBillVehicleService;
     @Autowired
+    private FinBillTrailerService finBillTrailerService;
+    @Autowired
     private FinBillFileService finBillFileService;
     @Autowired
     private FinBillApplicationPublicService finBillApplicationPublicService;
@@ -122,79 +133,58 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     @Autowired
     private FlowableFeign flowableFeign;
     @Autowired
-    private SysFormLinkFeign sysFormLinkFeign;
-    @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private CommonContractFeign commonContractFeign;
     @Autowired
-    private BusSalesOrderModelFeign busSalesOrderModelFeign;
-    @Autowired
-    private BusSalesOrderPriceFeign busSalesOrderPriceFeign;
-    @Autowired
-    private SysOrganizationFeign sysOrganizationFeign;
-    @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
     private MessageFeign messageFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private BaseTrailerFeign baseTrailerFeign;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<FinBillApplication> qw = new QueryWrapper<>();
         qw.eq("fba.useOrgSid", query.getUseOrgSid());
-        qw.eq("fba.createBySid", query.getStaffSid());
+        if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
+            qw.eq("fba.saleTypeKey", query.getSaleTypeKey());
+        }
         if (StringUtils.isNotBlank(query.getContractNo())) {
             qw.like("fba.contractNo", query.getContractNo());
         }
+        if (StringUtils.isNotBlank(query.getOpenTickUnitName())) {
+            qw.like("fba.openTickUnitName", query.getOpenTickUnitName());
+        }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
             qw.like("fba.customerName", query.getCustomerName());
         }
-        if (StringUtils.isNotBlank(query.getBillTypeKey())) {
-            qw.eq("fbv.billTypeKey", query.getBillTypeKey());
+        if (StringUtils.isNotBlank(query.getModelName())) {
+            qw.like("fba.modelName", query.getModelName());
         }
-        if (StringUtils.isNotBlank(query.getBillName())) {
-            qw.eq("fbv.billName", query.getBillName());
+        if (StringUtils.isNotBlank(query.getBillStateKey())) {
+            qw.eq("fba.billStateKey", query.getBillStateKey());
+        }
+        if (StringUtils.isNotBlank(query.getCreateByName())) {
+            qw.eq("fba.createByName", query.getCreateByName());
         }
         String applyStartDate = query.getApplyStartDate();
         String applyEndDate = query.getApplyEndDate();
-        qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(applyEndDate), "date_format (applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (fba.applyDate,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(applyEndDate), "date_format (fba.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')"
                 );
-        if (StringUtils.isNotBlank(query.getCreateByName())) {
-            qw.like("fba.createByName", query.getCreateByName());
-        }
-        if (StringUtils.isNotBlank(query.getBillState())) {
-            qw.like("fba.billState", query.getBillState());
-        }
         return qw;
     }
 
     public PagerVo<FinBillApplicationVo> listPageVo(PagerQuery<FinBillApplicationQuery> pq) {
         FinBillApplicationQuery query = pq.getParams();
-        String staffSid = query.getStaffSid();
-        ResultBean<List<SysStaffOrgVo>> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid);
-        List<SysStaffOrgVo> data = sysStaffOrgListByStaffSid.getData();
-        String orgSidPath = "";
-        for (SysStaffOrgVo datum : data) {
-            orgSidPath = datum.getOrgSidPath();
-            String[] split = orgSidPath.split("/");
-            for (String s : split) {
-                ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(s);
-                SysOrganizationVo data1 = sysOrganizationVoResultBean.getData();
-                Integer isDept = data1.getIsDept();
-                String psid = data1.getPsid();
-                if (isDept != null) {
-                    if (isDept == 0 && !psid.equals(0)) {
-                        orgSidPath = s;
-                        break;
-                    }
-                }
-            }
-        }
-        query.setUseOrgSid(orgSidPath);
         QueryWrapper<FinBillApplication> qw = createQueryWrapper(query);
         IPage<FinBillApplication> page = PagerUtil.queryToPage(pq);
         IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -205,7 +195,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     public ResultBean<String> saveOrUpdateDto(FinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dto.getOrgSidPath())) {
+        //用户的组织全路径
+        String orgSidPath = "";
+        if(StringUtils.isNotBlank(dto.getOrgSidPath())){
+            orgSidPath = dto.getOrgSidPath();
+        }else{
             //根据用户sid获取staffSid
             ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
             if (!userVoResultBean.getSuccess()) {
@@ -216,198 +210,126 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             if (!staffOrgResultBean.getSuccess()) {
                 return rb.setMsg(staffOrgResultBean.getMsg());
             }
-            //用户的组织全路径
-            String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-            dto.setOrgSidPath(orgSidPath);
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
+        dto.setOrgSidPath(orgSidPath);
+        List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
-        List<FinBillApplicationAppendxDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
-        List<FinBillApplicationAppendxDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
-        List<FinBillApplicationAppendxDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
-        CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
+        List<FinBillFileDto> khkpsqsApplicationAppendxs = dto.getKhkpsqsApplicationAppendxs();
+        List<FinBillFileDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
+        List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
         if (StringUtils.isBlank(dtoSid)) {//新增
             FinBillApplication finBillApplication = new FinBillApplication();
-            String sid = finBillApplication.getSid();
-            BeanUtil.copyProperties(dto, finBillApplication);
-            finBillApplication.setSid(sid);
-            FinBillApplicationPublic finBillApplicationPublic = new FinBillApplicationPublic();
-            String sid2 = finBillApplicationPublic.getSid();
-            BeanUtil.copyProperties(finBillApplication, finBillApplicationPublic);
-            finBillApplicationPublic.setSid(sid2);
-            finBillApplicationPublicService.save(finBillApplicationPublic);
-            finBillApplication.setBillAppPublicSid(sid2);
+            BeanUtil.copyProperties(dto, finBillApplication, "sid");
             finBillApplication.setNodeState("待提交");
+            String billNo = getApplyCode(dto.getUseOrgSid());
+            finBillApplication.setBillNo(billNo);
             save(finBillApplication);
+            //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
-                String sid1 = finBillVehicle.getSid();
-                BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle);
-                finBillVehicle.setSid(sid1);
-                finBillVehicle.setBillAppSid(sid);
+                BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle, "sid");
+                finBillVehicle.setBillAppSid(finBillApplication.getSid());
                 finBillVehicleService.save(finBillVehicle);
             }
-            for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) {
-                BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto);
-                String filePath = finBillApplicationAppendx.getFilePath();
+            //挂车开票信息
+            for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+                FinBillTrailer finBillTrailer = new FinBillTrailer();
+                BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+                finBillTrailer.setBillAppSid(finBillApplication.getSid());
+                finBillTrailerService.save(finBillTrailer);
+            }
+            //附件信息
+            for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
+                String filePath = finBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                     filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
                 }
-                commonAppendixDto.setLinkSid(sid);
-                commonAppendixDto.setFilePath(filePath);
-                commonAppendixDto.setCreateBySid(dto.getStaffSid());
-                commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType());
-                commonAppendixFeign.save(commonAppendixDto);
-                FinBillFile finBillFile = new FinBillFile();
-                finBillFile.setBillAppSid(sid);
-                finBillFile.setFileType(finBillApplicationAppendx.getAppendixName());
-                finBillFile.setFileUrl(filePath);
-                ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
-                CommonAppendixVo data = commonAppendixVoResultBean.getData();
-                String sid1 = data.getSid();
-                finBillFile.setFileSid(sid1);
-                finBillFileService.save(finBillFile);
+                finBillFileDto.setFileUrl(filePath);
+                finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                finBillFileDto.setAttachType(FinAttachTypeEnum.KHKPSQS.getAttachType());
+                finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
-            for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) {
-                BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto);
-                String filePath = finBillApplicationAppendx.getFilePath();
+            for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
+                String filePath = finBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                     filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
                 }
-                commonAppendixDto.setLinkSid(sid);
-                commonAppendixDto.setFilePath(filePath);
-                commonAppendixDto.setCreateBySid(dto.getStaffSid());
-                commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType());
-                commonAppendixFeign.save(commonAppendixDto);
-                FinBillFile finBillFile = new FinBillFile();
-                finBillFile.setBillAppSid(sid);
-                finBillFile.setFileType(finBillApplicationAppendx.getAppendixName());
-                finBillFile.setFileUrl(filePath);
-                ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
-                CommonAppendixVo data = commonAppendixVoResultBean.getData();
-                String sid1 = data.getSid();
-                finBillFile.setFileSid(sid1);
-                finBillFileService.save(finBillFile);
+                finBillFileDto.setFileUrl(filePath);
+                finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                finBillFileDto.setAttachType(FinAttachTypeEnum.KPXXQRS.getAttachType());
+                finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
-            for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) {
-                BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto);
-                String filePath = finBillApplicationAppendx.getFilePath();
+            for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
+                String filePath = finBillFileDto.getFileUrl();
                 if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                     filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
                 }
-                commonAppendixDto.setLinkSid(sid);
-                commonAppendixDto.setFilePath(filePath);
-                commonAppendixDto.setCreateBySid(dto.getStaffSid());
-                commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType());
-                commonAppendixFeign.save(commonAppendixDto);
-                FinBillFile finBillFile = new FinBillFile();
-                finBillFile.setBillAppSid(sid);
-                finBillFile.setFileType(finBillApplicationAppendx.getAppendixName());
-                finBillFile.setFileUrl(filePath);
-                ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
-                CommonAppendixVo data = commonAppendixVoResultBean.getData();
-                String sid1 = data.getSid();
-                finBillFile.setFileSid(sid1);
-                finBillFileService.save(finBillFile);
+                finBillFileDto.setFileUrl(filePath);
+                finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                finBillFileDto.setAttachType(FinAttachTypeEnum.CLDJHT.getAttachType());
+                finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
-            return rb.success().setMsg("保存成功").setData(sid);
+            return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
         FinBillApplication finBillApplication = fetchBySid(dtoSid);
         if (finBillApplication == null) {
             rb.setMsg("该数据不存在");
         }
-        commonAppendixFeign.deleteFiles(dtoSid);
         finBillFileService.deleteByFinAppSid(dtoSid);
-        for (FinBillApplicationAppendxDto finBillApplicationAppendx : khkpsqsApplicationAppendxs) {
-            BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto);
-            String filePath = finBillApplicationAppendx.getFilePath();
+        //附件信息
+        //挂车开票信息
+        for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+            FinBillTrailer finBillTrailer = new FinBillTrailer();
+            BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+            finBillTrailer.setBillAppSid(finBillApplication.getSid());
+            finBillTrailerService.save(finBillTrailer);
+        }
+        //附件信息
+        for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) {
+            String filePath = finBillFileDto.getFileUrl();
             if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
             }
-            commonAppendixDto.setLinkSid(dtoSid);
-            commonAppendixDto.setFilePath(filePath);
-            commonAppendixDto.setCreateBySid(dto.getStaffSid());
-            commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType());
-            commonAppendixFeign.save(commonAppendixDto);
-            FinBillFile finBillFile = new FinBillFile();
-            finBillFile.setBillAppSid(dtoSid);
-            finBillFile.setFileType(finBillApplicationAppendx.getAppendixName());
-            finBillFile.setFileUrl(filePath);
-            finBillFile.setCreateByName(commonAppendixDto.getName());
-            ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
-            CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            if (data == null) {
-                return rb.setMsg("请上传相关附件");
-            }
-            String sid1 = data.getSid();
-            finBillFile.setFileSid(sid1);
-            finBillFileService.save(finBillFile);
+            finBillFileDto.setFileUrl(filePath);
+            finBillFileDto.setBillAppSid(finBillApplication.getSid());
+            finBillFileDto.setAttachType(FinAttachTypeEnum.KHKPSQS.getAttachType());
+            finBillFileService.saveOrUpdateDto(finBillFileDto);
         }
-        for (FinBillApplicationAppendxDto finBillApplicationAppendx : kpxxqrsApplicationAppendxs) {
-            BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto);
-            String filePath = finBillApplicationAppendx.getFilePath();
+        for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) {
+            String filePath = finBillFileDto.getFileUrl();
             if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
             }
-            commonAppendixDto.setLinkSid(dtoSid);
-            commonAppendixDto.setFilePath(filePath);
-            commonAppendixDto.setCreateBySid(dto.getStaffSid());
-            commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType());
-            commonAppendixFeign.save(commonAppendixDto);
-            FinBillFile finBillFile = new FinBillFile();
-            finBillFile.setBillAppSid(dtoSid);
-            finBillFile.setFileType(finBillApplicationAppendx.getAppendixName());
-            finBillFile.setFileUrl(filePath);
-            finBillFile.setCreateByName(commonAppendixDto.getName());
-            ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
-            CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            if (data == null) {
-                return rb.setMsg("请上传相关附件");
-            }
-            String sid1 = data.getSid();
-            finBillFile.setFileSid(sid1);
-            finBillFileService.save(finBillFile);
+            finBillFileDto.setFileUrl(filePath);
+            finBillFileDto.setBillAppSid(finBillApplication.getSid());
+            finBillFileDto.setAttachType(FinAttachTypeEnum.KPXXQRS.getAttachType());
+            finBillFileService.saveOrUpdateDto(finBillFileDto);
         }
-        for (FinBillApplicationAppendxDto finBillApplicationAppendx : cldjhtApplicationAppendxs) {
-            BeanUtil.copyProperties(finBillApplicationAppendx, commonAppendixDto);
-            String filePath = finBillApplicationAppendx.getFilePath();
+        for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) {
+            String filePath = finBillFileDto.getFileUrl();
             if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                 filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
             }
-            commonAppendixDto.setLinkSid(dtoSid);
-            commonAppendixDto.setFilePath(filePath);
-            commonAppendixDto.setCreateBySid(dto.getStaffSid());
-            commonAppendixDto.setAttachType(CommonAttachTypeEnum.BILL_APPLICAYION.getAttachType());
-            commonAppendixFeign.save(commonAppendixDto);
-            FinBillFile finBillFile = new FinBillFile();
-            finBillFile.setBillAppSid(dtoSid);
-            finBillFile.setFileType(finBillApplicationAppendx.getAppendixName());
-            finBillFile.setFileUrl(filePath);
-            finBillFile.setCreateByName(commonAppendixDto.getName());
-            ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchByFilePath(filePath);
-            CommonAppendixVo data = commonAppendixVoResultBean.getData();
-            if (data == null) {
-                return rb.setMsg("请上传相关附件");
-            }
-            String sid1 = data.getSid();
-            finBillFile.setFileSid(sid1);
-            finBillFileService.save(finBillFile);
-        }
-        FinBillApplicationPublicDto finBillApplicationPublicDto = new FinBillApplicationPublicDto();
-        String billAppPublicSid = dto.getBillAppPublicSid();
-        FinBillApplicationPublic finBillApplicationPublic = finBillApplicationPublicService.fetchBySid(billAppPublicSid);
-        BeanUtil.copyProperties(dto, finBillApplicationPublic);
-        finBillApplicationPublic.setSid(billAppPublicSid);
-        updateBySid(dto, dtoSid);
-        BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto);
-        finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto, billAppPublicSid);
+            finBillFileDto.setFileUrl(filePath);
+            finBillFileDto.setBillAppSid(finBillApplication.getSid());
+            finBillFileDto.setAttachType(FinAttachTypeEnum.CLDJHT.getAttachType());
+            finBillFileService.saveOrUpdateDto(finBillFileDto);
+        }
         finBillVehicleService.delByBillAppSid(dtoSid);
         for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
             FinBillVehicle finBillVehicle = new FinBillVehicle();
-            BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle);
-            finBillVehicle.setSid(finBillVehicleDto.getSid());
+            BeanUtil.copyProperties(finBillVehicleDto, finBillVehicle, "sid");
             finBillVehicle.setBillAppSid(dtoSid);
             finBillVehicleService.save(finBillVehicle);
         }
+        finBillTrailerService.delByBillAppSid(dtoSid);
+        for (FinBillTrailerDto finBillTrailerDto : finBillTrailers) {
+            FinBillTrailer finBillTrailer = new FinBillTrailer();
+            BeanUtil.copyProperties(finBillTrailerDto, finBillTrailer, "sid");
+            finBillTrailer.setBillAppSid(dtoSid);
+            finBillTrailerService.save(finBillTrailer);
+        }
         return rb.success().setMsg("修改成功").setData(dtoSid);
     }
 
@@ -446,8 +368,51 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
         vo.setFinBillVehicles(finBillVehicleVos);
-        List<FinBillFileVo> finBillFileVos = finBillFileService.groupByList(sid);
-        vo.setFinBillFileVos(finBillFileVos);
+        List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid);
+        if (finBillTrailerVos.size() > 0){
+            vo.setFinBillTrailers(finBillTrailerVos);
+        }else {
+            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
+                List<TrailerVo> trailerVos = baseTrailerFeign.trailerList(baseVehicle.getSid()).getData();
+                for (TrailerVo trailerVo : trailerVos) {
+                    FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
+                    finBillTrailerVo.setBillAppSid(sid);
+                    finBillTrailerVo.setVinNo(finBillVehicleVo.getVinNo());
+                    finBillTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
+                    finBillTrailerVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey());
+                    finBillTrailerVo.setBillTypeValue(finBillVehicleVo.getBillTypeValue());
+                    finBillTrailerVo.setOpenTickSid(finBillVehicleVo.getOpenTickSid());
+                    finBillTrailerVo.setOpenTickName(finBillVehicleVo.getOpenTickName());
+                    finBillTrailerVos.add(finBillTrailerVo);
+                }
+            }
+            vo.setFinBillTrailers(finBillTrailerVos);
+        }
+        List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid);
+        for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
+            String fileUrl = khkpsqsApplicationAppendx.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            khkpsqsApplicationAppendx.setFileUrl(fileUrl);
+        }
+        List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillFileService.fetchkpxxqrsBySid(sid);
+        for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) {
+            String fileUrl = kpxxqrsApplicationAppendx.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            kpxxqrsApplicationAppendx.setFileUrl(fileUrl);
+        }
+        List<FinBillFileVo> cldjhtApplicationAppendxs = finBillFileService.fetchcldjhtBySid(sid);
+        for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) {
+            String fileUrl = cldjhtApplicationAppendx.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            cldjhtApplicationAppendx.setFileUrl(fileUrl);
+        }
+        vo.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
+        vo.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
+        vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         return vo;
     }
 
@@ -905,85 +870,111 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean submitFinBillApplication(SubmitFinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
-//        //根据用户sid获取staffSid
-//        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-//        if (!userVoResultBean.getSuccess()) {
-//            return rb.setMsg(userVoResultBean.getMsg());
-//        }
-//        //根据staffSid获取用户的组织全路径
-//        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-//        if (!staffOrgResultBean.getSuccess()) {
-//            return rb.setMsg(staffOrgResultBean.getMsg());
-//        }
-//        //用户的组织全路径
-//        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
-//        dto.setOrgSidPath(orgSidPath);
-//        FinBillApplication finBillApplication = fetchBySid(dto.getSid());
-//        int r = submitBusinessData(dto, finBillApplication);
-//        if (r == 3) {
-//            return rb.setMsg("该申请不存在");
-//        }
-//        if (r == 0) {
-//            return rb.setMsg("操作失败!提交的数据不一致");
-//        }
-//        //新增修改保存
-//        ResultBean<String> resultBean = saveOrUpdateDto(dto);
-//        if (!resultBean.getSuccess()) {
-//            return rb.setMsg(resultBean.getMsg());
-//        }
-//
-//        String businessSid = resultBean.getData();
-//        //创建BusinessVariables实体对象
-//        BusinessVariables bv = new BusinessVariables();
-//        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
-//        Map<String, Object> variables = new HashMap<>();
-//        Map<String, Object> appMap = new HashMap<>();
-//        appMap.put("contractSid", businessSid);
-//        variables.put("app", appMap);
-//        //用户的部门全路径sid
-//        bv.setOrgSidPath(orgSidPath);
-//        //业务sid
-//        bv.setBusinessSid(businessSid);
-//        //用户sid
-//        bv.setUserSid(dto.getUserSid());
-//        bv.setFormVariables(variables);
-//        //流程定义id
-//        bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
-//        if (r == 1) {
-//            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
-//            if (!voResultBean.getSuccess()) {
-//                return rb.setMsg(voResultBean.getMsg());
-//            }
-//            UpdateFlowFieldVo ufVo = voResultBean.getData();
-//            updateFlowFiled(BeanUtil.beanToMap(ufVo));
-//            //极光推送
-//            finBillApplication = fetchBySid(businessSid);
-//            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
-//            MessageFlowVo messageFlowVo = new MessageFlowVo();
-//            BeanUtil.copyProperties(ufVo, messageFlowVo);
-//            messageFlowableQuery.setUfVo(messageFlowVo);
-//            messageFlowableQuery.setAppMap(appMap);
-//            messageFlowableQuery.setBusinessSid(businessSid);
-//            messageFlowableQuery.setModuleName("开票申请");
-//            messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
-//            messageFlowableQuery.setMsgTitle("开票申请");
-//            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-//            return voResultBean;
-//        }
-//        if (r == 2) {
-//            if (StringUtils.isBlank(dto.getInstanceId())) {
-//                return rb.setMsg("参数错误：instanceId");
-//            }
-//            bv.setTaskId(finBillApplication.getTaskId());
-//            bv.setTaskDefKey(finBillApplication.getNodeSid());
-//            bv.setComment("重新提交");
-//            bv.setInstanceId(dto.getInstanceId());
-//            return complete(bv);
-//        }
+        //用户的组织全路径
+        String orgSidPath = "";
+        if(StringUtils.isNotBlank(dto.getOrgSidPath())){
+            orgSidPath = dto.getOrgSidPath();
+        }else{
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        }
+        dto.setOrgSidPath(orgSidPath);
+        FinBillApplication finBillApplication = fetchBySid(dto.getSid());
+        int r = submitBusinessDataPc(dto, finBillApplication);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
+        Map<String, Object> variables = new HashMap<>();
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("businessSid", businessSid);
+        variables.put("app", appMap);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getUserSid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            if (!voResultBean.getSuccess()) {
+                return rb.setMsg(voResultBean.getMsg());
+            }
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //极光推送
+            finBillApplication = fetchBySid(businessSid);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("开票申请");
+            messageFlowableQuery.setMsgContent(finBillApplication.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("开票申请");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
+            return voResultBean;
+        }
+        if (r == 2) {
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(finBillApplication.getTaskId());
+            bv.setTaskDefKey(finBillApplication.getNodeId());
+            bv.setComment("重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
         return null;
     }
 
-    private synchronized int submitBusinessData(SubmitBillApplicationDto dto, FinBillApplication finBillApplication) {
+    private synchronized int submitBusinessDataApp(SubmitBillApplicationDto dto, FinBillApplication finBillApplication) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (finBillApplication != null) {
+                String businessTaskId = finBillApplication.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    private synchronized int submitBusinessDataPc(SubmitFinBillApplicationDto dto, FinBillApplication finBillApplication) {
         int r = 0;
         if (StringUtils.isBlank(dto.getSid())) {
             r = 1;
@@ -1032,7 +1023,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);
         for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
             AppVinListVo appVinListVo = new AppVinListVo();
-            appVinListVo.setVIN(finBillVehicleVo.getVIN());
+            appVinListVo.setVIN(finBillVehicleVo.getVinNo());
             appVinListVo.setInvoiceName(finBillVehicleVo.getBillName());
             appVinListVo.setInvoiceNameKey(finBillVehicleVo.getBillNameSid());
             appVinListVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey());
@@ -1089,8 +1080,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
                 BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid");
                 finBillVehicle.setBillAppSid(sid);
-                finBillVehicle.setBillName(appVinListDto.getInvoiceName());
-                finBillVehicle.setBillNameSid(appVinListDto.getInvoiceNameKey());
+                //finBillVehicle.setBillName(appVinListDto.getInvoiceName());
+                //finBillVehicle.setBillNameSid(appVinListDto.getInvoiceNameKey());
                 finBillVehicleService.save(finBillVehicle);
             }
 
@@ -1144,8 +1135,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             for (AppVinListDto appVinListDto : vinList) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
                 BeanUtil.copyProperties(appVinListDto, finBillVehicle, "sid");
-                finBillVehicle.setBillName(appVinListDto.getInvoiceName());
-                finBillVehicle.setBillNameSid(appVinListDto.getInvoiceNameKey());
+                //finBillVehicle.setBillName(appVinListDto.getInvoiceName());
+                //finBillVehicle.setBillNameSid(appVinListDto.getInvoiceNameKey());
                 finBillVehicle.setBillAppSid(sid);
                 finBillVehicleService.save(finBillVehicle);
             }
@@ -1213,20 +1204,25 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean submitBillApplication(SubmitBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        //根据用户sid获取staffSid
-        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
-        if (!userVoResultBean.getSuccess()) {
-            return rb.setMsg(userVoResultBean.getMsg());
-        }
-        //根据staffSid获取用户的组织全路径
-        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
-        if (!staffOrgResultBean.getSuccess()) {
-            return rb.setMsg(staffOrgResultBean.getMsg());
-        }
         //用户的组织全路径
-        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        String orgSidPath = "";
+        if(StringUtils.isNotBlank(dto.getOrgSidPath())){
+            orgSidPath = dto.getOrgSidPath();
+        }else{
+            //根据用户sid获取staffSid
+            ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+            if (!userVoResultBean.getSuccess()) {
+                return rb.setMsg(userVoResultBean.getMsg());
+            }
+            //根据staffSid获取用户的组织全路径
+            ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+            if (!staffOrgResultBean.getSuccess()) {
+                return rb.setMsg(staffOrgResultBean.getMsg());
+            }
+            orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        }
         FinBillApplication finBillApplication = fetchBySid(dto.getSid());
-        int r = submitBusinessData(dto, finBillApplication);
+        int r = submitBusinessDataApp(dto, finBillApplication);
         if (r == 3) {
             return rb.setMsg("该申请不存在");
         }
@@ -1328,4 +1324,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             return complete(variables);
         }
     }*/
+   public String getApplyCode(String useOrgSid) {
+       ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid);
+       String orgCode = resultBean1.getData().getOrgCode();
+       BillNo b = new BillNo();
+       b.setOrgCode(orgCode);
+       b.setBillType(BillTypeEnum.KPSQ.getBillType());
+       String bill = Rule.getBill(b);
+       String i = baseMapper.selectNum(bill);
+       String billNo = "";
+       if (StringUtils.isNotBlank(i)) {
+           billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+       } else {
+           billNo = Rule.getBillNo(bill, 0);
+       }
+       return billNo;
+   }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java

@@ -73,4 +73,13 @@ public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
 	List<FinBillFileDetailsVo> fetchFileBySid(@Param("billAppSid") String billAppSid, @Param("fileType") String fileType);
 
     List<FinBillFileVo> groupByList(String sid);
+
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '客户开票申请书'")
+	List<FinBillFileVo> fetchkhkpsqsBySid(String sid);
+
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '开票信息确认书'")
+	List<FinBillFileVo> fetchkpxxqrsBySid(String sid);
+
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and fileType = '车辆登记合同'")
+	List<FinBillFileVo> fetchcldjhtBySid(String sid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java

@@ -145,4 +145,16 @@ public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, Fi
 	public List<FinBillFileVo> groupByList(String sid) {
 		return baseMapper.groupByList(sid);
 	}
+
+	public List<FinBillFileVo> fetchkhkpsqsBySid(String sid) {
+		return baseMapper.fetchkhkpsqsBySid(sid);
+	}
+
+	public List<FinBillFileVo> fetchkpxxqrsBySid(String sid) {
+		return baseMapper.fetchkpxxqrsBySid(sid);
+	}
+
+	public List<FinBillFileVo> fetchcldjhtBySid(String sid) {
+		return baseMapper.fetchcldjhtBySid(sid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbilltrailer;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerMapper.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerMapper <br/>
+ * Description: 开票挂车信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface FinBillTrailerMapper extends BaseMapper<FinBillTrailer> {
+
+	//@Update("update fin_bill_trailer set name=#{msg} where id=#{id}")
+	//IPage<FinBillTrailerVo> voPage(IPage<FinBillTrailer> page, @Param(Constants.WRAPPER) QueryWrapper<FinBillTrailer> qw);
+	
+	IPage<FinBillTrailerVo> selectPageVo(IPage<FinBillTrailer> page, @Param(Constants.WRAPPER) Wrapper<FinBillTrailer> qw);
+	
+	List<FinBillTrailerVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinBillTrailer> qw);
+	
+	@Select("select * from fin_bill_trailer")
+	List<FinBillTrailerVo> selectListVo();
+
+	@Select("select * from fin_bill_trailer where billAppSid = #{sid}")
+    List<FinBillTrailerVo> fetchByMainSid(String sid);
+
+	@Delete("delete from fin_bill_trailer where billAppSid = #{dtoSid}")
+    void delByBillAppSid(String dtoSid);
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo">
+		SELECT * FROM fin_bill_trailer <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo">
+		SELECT * FROM fin_bill_trailer <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbilltrailer;
+
+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.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerQuery;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerFeignFallback.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerRest <br/>
+ * Description: 开票挂车信息表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "开票挂车信息表")
+@RestController("com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerRest")
+@RequestMapping("v1/finbilltrailer")
+public class FinBillTrailerRest implements FinBillTrailerFeign {
+
+	@Autowired
+	private FinBillTrailerService finBillTrailerService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<FinBillTrailerVo>> listPage(@RequestBody PagerQuery<FinBillTrailerQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<FinBillTrailerVo> pv = finBillTrailerService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody FinBillTrailerDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		finBillTrailerService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		finBillTrailerService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<FinBillTrailerDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		FinBillTrailerDetailsVo vo = finBillTrailerService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerService.java

@@ -0,0 +1,118 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.biz.finbilltrailer;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailer;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerQuery;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerDto;
+import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-fin(开票挂车信息) <br/>
+ * File: FinBillTrailerService.java <br/>
+ * Class: com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService <br/>
+ * Description: 开票挂车信息表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-04-06 16:41:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class FinBillTrailerService extends MybatisBaseService<FinBillTrailerMapper, FinBillTrailer> {
+	private QueryWrapper<FinBillTrailer> createQueryWrapper(FinBillTrailerQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<FinBillTrailer> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<FinBillTrailerVo> listPageVo(PagerQuery<FinBillTrailerQuery> pq) {
+		FinBillTrailerQuery query = pq.getParams();
+		QueryWrapper<FinBillTrailer> qw = createQueryWrapper(query);
+		IPage<FinBillTrailer> page = PagerUtil.queryToPage(pq);
+		IPage<FinBillTrailerVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<FinBillTrailerVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(FinBillTrailerDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(FinBillTrailerDto dto){
+		FinBillTrailer entity = new FinBillTrailer();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(FinBillTrailerDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		FinBillTrailer entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public FinBillTrailerDetailsVo fetchDetailsVoBySid(String sid){
+		FinBillTrailer entity = fetchBySid(sid);
+		FinBillTrailerDetailsVo vo = new FinBillTrailerDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public List<FinBillTrailerVo> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+	}
+
+	public void delByBillAppSid(String dtoSid) {
+		baseMapper.delByBillAppSid(dtoSid);
+	}
+}

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

@@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
@@ -1230,6 +1231,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success().setMsg("驳回成功");
     }
 
+    /**
+     * 需求：
+     * 全款：
+     * 推送车款，根据客户名称和手机号查询分组，查询是否有车架号，若有车架号，则需要推送具体的车架号的数组。若没有车架号，则按照客户名称和手机号推送该客户整体的车款
+     * 推送订金，根据客户名称和手机号查询分组，查询是否有车架号，若有车架号，则需要推送具体的车架号的数组。若没有车架号，则按照客户名称和手机号推送该客户整体的订金
+     *
+     * 贷款：
+     * 推送车款，
+     * 查询所有的贷款的车款数据，推送临时车架号。
+     *
+     * 推送订金，
+     * 查询所有的贷款的订金数据，推送临时车架号。
+     *
+     *
+     *
+     *
+     * @param sid
+     * @param userSid
+     * @return
+     */
     public ResultBean cashierConfirm(String sid, String userSid) {
         ResultBean rb = ResultBean.fireFail();
         FinCollectionConfirmation confirmation = fetchBySid(sid);
@@ -1359,11 +1380,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
 
             } else {
-                fEntityList = new ArrayList<>();
-                freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                 finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
                 if (!finSelectedReceivablesDetailedVos1.isEmpty()) {
                     for (int i = 0; i < finSelectedReceivablesDetailedVos1.size(); i++) {
+                        fEntityList = new ArrayList<>();
+                        freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                         FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = finSelectedReceivablesDetailedVos1.get(i);
                         //先推送客户
                         BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone(), finSelectedReceivablesDetailedVo.getCustomerSid(), sid);
@@ -1491,11 +1512,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 }
 
             } else {
-                fEntityList = new ArrayList<>();
-                freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                 finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
                 if (!finSelectedReceivablesDetailedVos1.isEmpty()) {
                     for (int i = 0; i < finSelectedReceivablesDetailedVos1.size(); i++) {
+                        fEntityList = new ArrayList<>();
+                        freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                         FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = finSelectedReceivablesDetailedVos1.get(i);
                         //先推送客户
                         BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone(), finSelectedReceivablesDetailedVo.getCustomerSid(), sid);
@@ -1620,11 +1641,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
                 }
             } else {
-                fEntityList = new ArrayList<>();
-                freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                 finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
                 if (!finSelectedReceivablesDetailedVos2.isEmpty()) {
                     for (int i = 0; i < finSelectedReceivablesDetailedVos2.size(); i++) {
+                        fEntityList = new ArrayList<>();
+                        freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
                         FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo = finSelectedReceivablesDetailedVos2.get(i);
                         //先推送客户
                         BdCustomer bdCustomer = createBdCustomer(confirmation.getUseOrgSid(), finSelectedReceivablesDetailedVo.getCustomerName(), finSelectedReceivablesDetailedVo.getCustomerPhone(), finSelectedReceivablesDetailedVo.getCustomerSid(), sid);
@@ -1922,6 +1943,17 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 busDeliveredDto.setVinNo(v.getVIN());
                                 busDeliveredDto.setMobile(v.getCustomerPhone());
                                 busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice());
+                                SubmitVo intermediary1 = vo.getIntermediary1();
+                                if(intermediary1 != null){
+                                    busDeliveredDto.setDistributorName(intermediary1.getIntermediaryName());
+                                    busDeliveredDto.setDistributorPrice(intermediary1.getAgencyFee());
+                                }
+                                SubmitVo intermediary2 = vo.getIntermediary2();
+                                if(intermediary2 != null){
+                                    busDeliveredDto.setDistributorNameTwo(intermediary2.getIntermediaryName());
+                                    busDeliveredDto.setDistributorPriceTwo(intermediary2.getAgencyFee());
+                                }
+                                busDeliveredDto.setSingleCarDiscountPrice(priceInfoVo.getSingleCarDiscountPrice());
                                 //根据客户sid查询客户的身份证号
                                 AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
                                 busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@@ -510,7 +510,10 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = baseOutsourcingApplicationFeign.fetchBySid(finPaymentrecord.getApplySid()).getData();
         BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyFeign.fetchSid(finPaymentrecord.getApplySid()).getData();
         BaseVehicleActualPay baseVehicleActualPay = baseVehicleActualPayFeign.fetchBySid(finPaymentrecord.getApplySid()).getData();
-        BaseVehicleActualSalesDetailsVo baseVehicleActualSalesDetailsVo = baseVehicleActualSalesFeign.details(baseVehicleActualPay.getVehicleActualSid()).getData();
+        BaseVehicleActualSalesDetailsVo baseVehicleActualSalesDetailsVo = null;
+        if (baseVehicleActualPay != null){
+            baseVehicleActualSalesDetailsVo = baseVehicleActualSalesFeign.details(baseVehicleActualPay.getVehicleActualSid()).getData();
+        }
         if (baseOutsourcingApplicationDetailsVo != null) {
             if (StringUtils.isNotBlank(baseOutsourcingApplicationDetailsVo.getApplicationCode())) {
                 dataMap.put("applyCode", baseOutsourcingApplicationDetailsVo.getApplicationCode());

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -12,7 +12,7 @@ public enum ProcDefEnum {
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
-    FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
+    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),
@@ -49,7 +49,7 @@ public enum ProcDefEnum {
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
-    FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
+    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:12:735004"),

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue

@@ -622,6 +622,7 @@ export default {
         element.modelSid = this.modelSid
         element.staffSid = window.sessionStorage.getItem('staffSid')
         element.userSid = window.sessionStorage.getItem('userSid')
+        element.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       })
       console.log('关联数据', 211154)
       setRel(rel_list).then(response => {

doc/databases/bus-center_tables.sql

@@ -170,26 +170,37 @@ CREATE TABLE `bus_handover_items`
 DROP TABLE IF EXISTS `bus_delivered`;
 CREATE TABLE `bus_delivered`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
-    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
-    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
-    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
-    `type`        INT(32)              DEFAULT NULL COMMENT '类型：1车款交清、2欠款提车',
-    `contractNo`  VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
-    `name`        VARCHAR(64)          DEFAULT NULL COMMENT '客户名称',
-    `vinNo`       VARCHAR(64)          DEFAULT NULL COMMENT '车架号',
-    `modelName`   VARCHAR(200)         DEFAULT NULL COMMENT '车型别名',
-    `mobile`      VARCHAR(64)          DEFAULT NULL COMMENT '联系电话',
-    `idNo`        VARCHAR(64)          DEFAULT NULL COMMENT '证件号码',
-    `address`     VARCHAR(64)          DEFAULT NULL COMMENT '联系地址',
-    `price`       VARCHAR(200)         DEFAULT NULL COMMENT '成交价',
+    `id`                     int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                    varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`            int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`               int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                  int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`               int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`            varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`            varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `type`                   INT(32)              DEFAULT NULL COMMENT '类型：1车款交清、2欠款提车',
+    `subscription`           VARCHAR(64)          DEFAULT NULL COMMENT '业务状态',
+    `subscriptionKey`        VARCHAR(64)          DEFAULT NULL COMMENT '业务状态',
+    `paymentMethod`          VARCHAR(64)          DEFAULT NULL COMMENT '销售类型',
+    `paymentMethodKey`       VARCHAR(64)          DEFAULT NULL COMMENT '销售类型',
+    `contractNo`             VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
+    `name`                   VARCHAR(64)          DEFAULT NULL COMMENT '客户名称',
+    `vinNo`                  VARCHAR(64)          DEFAULT NULL COMMENT '车架号',
+    `modelName`              VARCHAR(200)         DEFAULT NULL COMMENT '车型别名',
+    `mobile`                 VARCHAR(64)          DEFAULT NULL COMMENT '联系电话',
+    `idNo`                   VARCHAR(64)          DEFAULT NULL COMMENT '证件号码',
+    `address`                VARCHAR(64)          DEFAULT NULL COMMENT '联系地址',
+    `price`                  VARCHAR(200)         DEFAULT NULL COMMENT '成交价',
+    `useOrgSid`              VARCHAR(200)         DEFAULT NULL COMMENT '分公司sid',
+    `useOrgName`             VARCHAR(200)         DEFAULT NULL COMMENT '分公司名称',
+    `distributorName`        VARCHAR(200)         DEFAULT NULL COMMENT '返利人1',
+    `distributorPrice`       VARCHAR(200)         DEFAULT NULL COMMENT '返利金额1',
+    `distributorNameTwo`     VARCHAR(200)         DEFAULT NULL COMMENT '返利人2',
+    `distributorPriceTwo`    VARCHAR(200)         DEFAULT NULL COMMENT '返利金额2',
+    `singleCarDiscountPrice` VARCHAR(200)         DEFAULT NULL COMMENT '销售折让',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB
@@ -199,24 +210,48 @@ CREATE TABLE `bus_delivered`
 DROP TABLE IF EXISTS `bus_delivered_apply`;
 CREATE TABLE `bus_delivered_apply`
 (
-    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `sid`         varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
-    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`       int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注',
-    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
-    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
-    `contractNo`  VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
-    `applyDate`   timestamp   null     DEFAULT NULL COMMENT '申请日期',
-    `name`        VARCHAR(64)          DEFAULT NULL COMMENT '客户名称',
-    `modelName`   VARCHAR(64)          DEFAULT NULL COMMENT '车型别名',
-    `applyName`   VARCHAR(64)          DEFAULT NULL COMMENT '申请人',
-    `applySid`    VARCHAR(64)          DEFAULT NULL COMMENT '申请人sid',
-    `isTerminal`  int(32)              DEFAULT NULL COMMENT '是否是终端:1是，0不是',
+    `id`                  int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                 varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`         int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`          timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`            int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`               int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`            int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`             varchar(255)         DEFAULT NULL COMMENT '备注',
+    `createBySid`         varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`         varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `contractNo`          VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
+    `billNo`              VARCHAR(64)          DEFAULT NULL COMMENT '单据编号',
+    `name`                VARCHAR(64)          DEFAULT NULL COMMENT '客户名称',
+    `modelName`           VARCHAR(64)          DEFAULT NULL COMMENT '车型别名',
+    `paymentMethod`       VARCHAR(64)          DEFAULT NULL COMMENT '销售类型',
+    `paymentMethodKey`    VARCHAR(64)          DEFAULT NULL COMMENT '销售类型',
+    `applyName`           VARCHAR(64)          DEFAULT NULL COMMENT '申请人',
+    `applySid`            VARCHAR(64)          DEFAULT NULL COMMENT '申请人sid',
+    `useOrgSid`           VARCHAR(64)          DEFAULT NULL COMMENT '分公司sid',
+    `type`                varchar(64)          DEFAULT NULL COMMENT '实际购车人：0订单客户、1贷款人、2其他人',
+    `mobile`              varchar(64)          DEFAULT NULL COMMENT '客户手机号',
+    `nodeState`           varchar(64)          DEFAULT NULL COMMENT '审核状态',
+    `procDefId`           varchar(64)          DEFAULT NULL COMMENT '流程定义id',
+    `procInstId`          varchar(64)          DEFAULT NULL COMMENT '流程实例id',
+    `taskId`              varchar(64)          DEFAULT NULL COMMENT '任务id',
+    `taskDefKey`          varchar(64)          DEFAULT NULL COMMENT '环节id',
+    `modelSid`            varchar(64)          DEFAULT NULL COMMENT '车型sid',
+    `configSid`           varchar(64)          DEFAULT NULL COMMENT '配置sid',
+    `applyDeptSid`        varchar(64)          DEFAULT NULL COMMENT '发起部门sid',
+    `applyDept`           varchar(64)          DEFAULT NULL COMMENT '发起部门',
+    `staffUserSid`        varchar(64)          DEFAULT NULL COMMENT '销售专员用户sid',
+    `staffName`           varchar(64)          DEFAULT NULL COMMENT '销售专员名称',
+    `staffDeptSid`        varchar(64)          DEFAULT NULL COMMENT '销售部门sid',
+    `staffDeptName`       varchar(64)          DEFAULT NULL COMMENT '销售部门',
+    `loanName`            varchar(64)          DEFAULT NULL COMMENT '贷款人',
+    `loanMobile`          varchar(64)          DEFAULT NULL COMMENT '贷款人手机号',
+    `distributorName`     VARCHAR(200)         DEFAULT NULL COMMENT '返利人1',
+    `distributorPrice`    VARCHAR(200)         DEFAULT NULL COMMENT '返利金额1',
+    `distributorNameTwo`  VARCHAR(200)         DEFAULT NULL COMMENT '返利人2',
+    `distributorPriceTwo` VARCHAR(200)         DEFAULT NULL COMMENT '返利金额2',
+    `price`               varchar(64)          DEFAULT NULL COMMENT '成交价',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB
@@ -226,21 +261,23 @@ CREATE TABLE `bus_delivered_apply`
 DROP TABLE IF EXISTS `bus_delivered_apply_details`;
 CREATE TABLE `bus_delivered_apply_details`
 (
-    `id`            int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `sid`           varchar(64) NOT NULL COMMENT 'sid',
-    `lockVersion`   int(32)              DEFAULT '0' COMMENT '版本锁',
-    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
-    `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
-    `state`         int(32)              DEFAULT '1' COMMENT '状态',
-    `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
-    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注',
-    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
-    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
-    `applySid`      VARCHAR(64)          DEFAULT NULL COMMENT '出库申请sid',
-    `vinNo`         varchar(64)          DEFAULT NULL COMMENT '车架号',
-    `price`         varchar(64)          DEFAULT NULL COMMENT '成交价',
-    `useMessageSid` VARCHAR(64)          DEFAULT NULL COMMENT '使用人信息sid',
+    `id`                     int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                    varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`            int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`             timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`               int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`                  int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`               int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`                varchar(255)         DEFAULT NULL COMMENT '备注(赠送套餐内容)',
+    `createBySid`            varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`            varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `applySid`               VARCHAR(64)          DEFAULT NULL COMMENT '出库申请sid',
+    `vinNo`                  varchar(64)          DEFAULT NULL COMMENT '车架号',
+    `vinSid`                 varchar(64)          DEFAULT NULL COMMENT '车辆sid',
+    `useMessageSid`          VARCHAR(64)          DEFAULT NULL COMMENT '使用人信息sid',
+    `singleCarDiscountPrice` VARCHAR(200)         DEFAULT NULL COMMENT '销售折让',
+    `discountAll`            VARCHAR(200)         DEFAULT NULL COMMENT '赠送套餐',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB
@@ -260,13 +297,14 @@ CREATE TABLE `bus_delivered_details_discount`
     `remarks`         varchar(255)         DEFAULT NULL COMMENT '备注',
     `createBySid`     varchar(64)          DEFAULT NULL COMMENT '创建人sid',
     `updateBySid`     varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `applySid`        varchar(64)          DEFAULT NULL COMMENT '出库申请sid',
     `detailsSid`      VARCHAR(64)          DEFAULT NULL COMMENT '出库车辆表sid',
     `name`            varchar(64)          DEFAULT NULL COMMENT '优惠包名称',
     `price`           varchar(64)          DEFAULT NULL COMMENT '价值',
     `discountExplain` VARCHAR(64)          DEFAULT NULL COMMENT '优惠包项目说明',
     `num`             int(32)              DEFAULT NULL COMMENT '数量',
-    `surplusNum`      int(32)              DEFAULT NULL COMMENT '剩余数量',
     `giveNum`         int(32)              DEFAULT NULL COMMENT '本次赠送数量',
+    `discountSid`     varchar(32)          DEFAULT NULL COMMENT '销售订单中主车优惠sid',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB