Merge remote-tracking branch 'origin/master'

# Conflicts:
#	anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -69,7 +69,8 @@ public class BaseVehicleStateEnum {
         JC_PASS("4", "交车审核通过"),
         BUS_STOP("5", "业务终止"),
         DDBA_SAVEVIN("6", "录入车架号"),
-        FIN_RQ("7", "款项认款"),
+        FIN_RQ("7", "认款完成"),
+        FIN_WRQ("8", "认款未完成"),
 
         ;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -58,7 +58,9 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
             } else if (BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey().equals(operateType)) {
                 //认款办理确认以及结转审核通过的更新款项状态为1  已交清，否则为0
                 baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_JQ.getStateKey());
-
+            }else if(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey().equals(operateType)){
+                //认款办理确认以及结转审核通过的更新款项状态为1  已交清，否则为0
+                baseVehicleState.setFinState(BaseVehicleStateEnum.BusStateEnum.FIN_STATE_WJQ.getStateKey());
             }
 
 

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

@@ -78,6 +78,7 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
      * @return
      */
     IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
+    IPage<AppBusDeliveredPageVo> getRetrievalNotLists(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
 
     /**
      * 查询车架号
@@ -96,4 +97,8 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
     BusDelivered getState(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
 
     BusDelivered selectByBusVinSid(String busVinSid);
+
+    List<String> selectByState();
+
+    IPage<BusDeliveredVo> selectListsVos(IPage<BusDelivered> page, @Param(Constants.WRAPPER)QueryWrapper<BusDelivered> qw);
 }

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

@@ -3,29 +3,29 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-   <!-- <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
+    <!-- <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
-        SELECT bd.sid,
+         SELECT bd.sid,
-        bd.contractNo,
+         bd.contractNo,
-        bd.name,
+         bd.name,
-        bd.vinNo,
+         bd.vinNo,
-        bd.subscription,
+         bd.subscription,
-        bd.subscriptionKey,
+         bd.subscriptionKey,
-        bd.paymentMethodKey,
+         bd.paymentMethodKey,
-        bd.paymentMethod,
+         bd.paymentMethod,
-        bd.modelName,
+         bd.modelName,
-        bd.price,
+         bd.price,
-        bd.mobile,
+         bd.mobile,
-        bd.idNo,
+         bd.idNo,
-        bd.address,
+         bd.address,
-        bd.price,
+         bd.price,
-        bd.distributorName,
+         bd.distributorName,
-        bd.distributorPrice,
+         bd.distributorPrice,
-        bd.distributorNameTwo,
+         bd.distributorNameTwo,
-        bd.distributorPriceTwo,
+         bd.distributorPriceTwo,
-        bd.singleCarDiscountPrice
+         bd.singleCarDiscountPrice
-        FROM bus_delivered bd
+         FROM bus_delivered bd
-            ${ew.customSqlSegment}
+             ${ew.customSqlSegment}
-    </select>-->
+     </select>-->
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
         SELECT *
@@ -39,8 +39,8 @@
             resultType="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
         SELECT bd.*
         FROM bus_delivered bd
-        left join bus_sales_order bo on bo.contractNo = bd.contractNo
+                 left join bus_sales_order bo on bo.contractNo = bd.contractNo
-        left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+                 left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">
@@ -51,18 +51,66 @@
                   , #{name}
                   , '%')
             </if>
-            and (select count(*) from bus_sales_order_vehicle bbv left join bus_sales_order bo on bo.sid = bbv.salesOrderSid where length(bbv.linkSid)>0 and bo.contractNo = bd.contractNo)>0
+            AND (
+            SELECT
+            count(*)
+            FROM
+            bus_sales_order_vehicle bbv
+            LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
+            WHERE
+            length( bbv.linkSid )> 0
+            AND bo.contractNo = bd.contractNo
+            )> 0
+        </where>
+        group by bd.contractNo
+    </select>
+
+    <resultMap id="ListMap" type="com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo">
+        <result column="sid" jdbcType="VARCHAR" property="sid"/>
+        <result column="contractNo" jdbcType="VARCHAR" property="contractNo"/>
+        <result column="paymentMethod" jdbcType="INTEGER" property="paymentMethod"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <collection property="vinList" ofType="com.yxt.anrui.buscenter.api.sysmobilemenu.SysMobileMenuListVo"
+                    select="vinList" column="contractNo">
+        </collection>
+    </resultMap>
+    <select id="getRetrievalNotLists"
+            resultMap="ListMap">
+        SELECT bd.*
+        FROM bus_delivered bd
+        left join bus_sales_order bo on bo.contractNo = bd.contractNo
+        left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
+        <where>
+            ${ew.sqlSegment}
+            <if test="name != null and name != ''">
+                and concat(IFNULL(bd.contractNo
+                , '')
+                , ifnull(bd.`name`
+                , '')) LIKE concat('%'
+                , #{name}
+                , '%')
+            </if>
+            AND (
+            SELECT
+            count(*)
+            FROM
+            bus_sales_order_vehicle bbv
+            LEFT JOIN bus_sales_order bo ON bo.sid = bbv.salesOrderSid
+            WHERE
+            length( bbv.linkSid )> 0
+            AND bo.contractNo = bd.contractNo
+            )> 0
         </where>
         group by bd.contractNo
     </select>
 
     <select id="selVinListVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo">
-        SELECT RIGHT(bv.linkNo, 8) as vin,bd.busVinSid,bd.subscription as businessState,bv.linkSid as vinSid
+        SELECT RIGHT(bv.linkNo, 8) as vin, bd.busVinSid, bd.subscription as businessState, bv.linkSid as vinSid
         FROM bus_delivered bd
-        left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
+                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
         <where>
             ${ew.sqlSegment}
-            and length(bv.linkSid)>0
+              and length(bv.linkSid) > 0
         </where>
     </select>
 
@@ -82,7 +130,9 @@
     </update>
 
     <update id="updateStateByContractNo">
-        update bus_delivered set state = #{state} where contractNo = #{contractNo} and busVinSid in
+        update bus_delivered
+        set state = #{state} where contractNo = #{contractNo}
+                               and busVinSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -90,39 +140,75 @@
 
     <select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
         SELECT bd.sid,
-        bd.contractNo,
+               bd.contractNo,
-        bd.name,
+               bd.name,
-        bd.busVinSid,
+               bd.busVinSid,
-       <!-- bd.vinNo,-->
+               bd.subscription,
-        bd.subscription,
+               bd.paymentMethod,
-        <!--bd.subscriptionKey,
+               RIGHT(bv.linkNo, 8) as vinNo,
-        bd.paymentMethodKey,-->
+               bd.busVinSid,
-        bd.paymentMethod,<!--,
+               bv.linkSid          as vinSid
-        bd.modelName,
+        FROM bus_delivered bd
-        bd.price,
+                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
-        bd.mobile,
+        <where>
-        bd.idNo,
+            ${ew.sqlSegment}
-        bd.address,
+              and length(bv.linkSid) > 0
-        bd.price,
+        </where>
-        bd.distributorName,
+    </select>
-        bd.distributorPrice,
+
-        bd.distributorNameTwo,
+    <select id="selectListsVo" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
-        bd.distributorPriceTwo,
+        SELECT bd.sid,
-        bd.singleCarDiscountPrice-->
+               bd.contractNo,
-        RIGHT(bv.linkNo, 8) as vinNo,bd.busVinSid,bv.linkSid as vinSid
+               bd.name,
+               bd.busVinSid,
+               bd.subscription,
+               bd.paymentMethod,
+               RIGHT(bv.linkNo, 8) as vinNo,
+               bd.busVinSid,
+               bv.linkSid          as vinSid
         FROM bus_delivered bd
-        left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
+                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
         <where>
             ${ew.sqlSegment}
-            and length(bv.linkSid)>0
+              and length(bv.linkSid) > 0
         </where>
     </select>
 
     <select id="getState" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDelivered">
-        select * from bus_delivered where contractNo = #{contractNo} and busVinSid = #{vinSid}
+        select *
+        from bus_delivered
+        where contractNo = #{contractNo}
+          and busVinSid = #{vinSid}
     </select>
 
     <select id="selectByBusVinSid" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDelivered">
-        select * from bus_delivered where busVinSid = #{busVinSid}
+        select *
+        from bus_delivered
+        where busVinSid = #{busVinSid}
+    </select>
+
+    <select id="selectByState" resultType="java.lang.String">
+        select busSid
+        from anrui_base.base_vehicle_state
+        where busState = '401'
+          and finState = '1'
+    </select>
+
+    <select id="selectListsVos" resultType="com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredVo">
+        SELECT bv.sid,
+               bo.contractNo,
+               bo.customerName name,
+               bv.sid busVinSid,
+               '正常交款' as subscription,
+               bo.payType paymentMethod,
+               RIGHT(bv.linkNo, 8) as vinNo,
+               bv.linkSid          as vinSid
+        FROM bus_sales_order_vehicle bv
+                 left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        left join anrui_base.base_vehicle bbv on bbv.sid = bv.linkSid
+        <where>
+            ${ew.sqlSegment}
+              and length(bv.linkSid) > 0 and bbv.vehicleStateValue != '出库'
+        </where>
     </select>
 </mapper>

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

@@ -160,6 +160,47 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         return p;
     }
 
+    /**
+     * 待出库车辆分页列表
+     *
+     * @param pq 查询条件
+     * @return 待出库车辆分页列表的数据
+     */
+    public PagerVo<BusDeliveredVo> listPageVos(PagerQuery<BusDeliveredQuery> pq) {
+        BusDeliveredQuery query = pq.getParams();
+        QueryWrapper<BusDelivered> qw = new QueryWrapper<>();
+        if (query != null) {
+            //合同编号
+            if (StringUtils.isNotBlank(query.getContractNo())) {
+                qw.like("bd.contractNo", query.getContractNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(query.getName())) {
+                qw.like("bd.name", query.getName());
+            }
+            //车架号
+            if (StringUtils.isNotBlank(query.getVinNo())) {
+                qw.like("bv.linkNo", query.getVinNo());
+            }
+            //车架号集合
+            if (query.getVinSid().size() > 0) {
+                qw.notIn("bv.linkSid", query.getVinSid());
+            }
+            //待出库：1，出库申请：0
+            qw.eq("bd.state", 1);
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                qw.eq("bd.createBySid", query.getUserSid());
+            }
+        }
+        //查询所有待出库的车辆busVinSid
+        List<String> busVinSidList = baseMapper.selectByState();
+        //查询销售订单中申请人是当前登录人且已办结的，linkSid有值，且在车辆台账中不为出库的。
+        IPage<BusDelivered> page = PagerUtil.queryToPage(pq);
+        IPage<BusDeliveredVo> pagging = baseMapper.selectListsVos(page, qw);
+        PagerVo<BusDeliveredVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
     public void saveOrUpdateDto(BusDeliveredDto dto) {
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
@@ -230,6 +271,35 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
         return iPage;
     }
 
+    public IPage<AppBusDeliveredPageVo> getRetrievalNotLists(PagerQuery<AppBusDeliveredPageQuery> pq) {
+        QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
+        String name = pq.getParams().getName();
+        IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
+        String orgPath = pq.getParams().getOrgPath();
+        String orgSid = "";
+        if (StringUtils.isNotBlank(orgPath)) {
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        } else {
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData();
+        }
+        qw.eq("bd.useOrgSid", orgSid);
+        qw.eq("bd.state", 1);
+        if (StringUtils.isNotBlank(pq.getParams().getUserSid())) {
+            qw.eq("bd.createBySid", pq.getParams().getUserSid());
+        }
+        IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotLists(page, qw, name);
+        for (AppBusDeliveredPageVo record : iPage.getRecords()) {
+            String contractNo = record.getContractNo();
+            QueryWrapper qw2 = new QueryWrapper<>();
+            //待出库：1，出库申请：0
+            qw2.eq("bd.state", 1);
+            qw2.eq("bd.contractNo", contractNo);
+            List<AppVinListVo> vinListVo = baseMapper.selVinListVo(contractNo, qw2);
+            record.setVinList(vinListVo);
+        }
+        return iPage;
+    }
+
     public ResultBean<AppDeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
         ResultBean<AppDeliveredDetailsVo> rb = ResultBean.fireFail();
         AppDeliveredDetailsVo appDeliveredDetailsVo = new AppDeliveredDetailsVo();
@@ -547,33 +617,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
 
 
         }
-
-
-
-     /*   AppDeliveredDetailsVo vo = new AppDeliveredDetailsVo();
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        BusDelivered busDelivered = fetchBySid(query.getSid());
-        String vin = busDelivered.getVinNo();
-        BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vin, busDelivered.getUseOrgSid()).getData();
-        if (baseVehicle != null) {
-            vo.setModelSid(baseVehicle.getModelSid());
-            vo.setConfigSid(baseVehicle.getModelConfigSid());
-        }
-        vo.setContractId(busDelivered.getContractNo());
-        vo.setModel(busDelivered.getModelName());
-        vo.setMobile(busDelivered.getMobile());
-        vo.setDate(simpleDateFormat.format(new Date()));
-        vo.setUserSid(query.getUserSid());
-        vo.setName(busDelivered.getName());
-        List<String> list = query.getList();
-        List<AppCarListVo> appCarListVos = new ArrayList<>();
-        for (int i = 0; i < list.size(); i++) {
-            AppCarListVo appCarListVo = baseMapper.getDeliveredPice(list.get(i));
-            appCarListVos.add(appCarListVo);
-        }
-        vo.setCarList(appCarListVos);
-        vo.setTerminalKey("0");
-        vo.setTerminalValue("否");*/
         if (codeMsg) {
             String msgs = String.join(",", nameList);
             return rb.success().setData(appDeliveredDetailsVo).setCode("20005").setMsg(msgs + "优惠套餐数量已超出，赠送数量已重置为0");

anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/acceptedmoney.vue

@@ -49,6 +49,11 @@
                   <span>{{ scope.row.useOrgName }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="采购系统" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.purchaseSystemName }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="销售部门" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.staffDeptName }}</span>
@@ -169,6 +174,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [],
+      multipleSelection: [],
       listLoading: false,
       listQuery: {
         current: 1,
@@ -232,6 +238,7 @@ export default {
     // 获取数据sid
     handleSelectionChange(row) {
       const aa = []
+      this.multipleSelection = row
       row.forEach(element => {
         aa.push(element.sid)
       })
@@ -283,6 +290,12 @@ export default {
     },
     toCarryDown() {
       if (this.sids.length > 0) {
+        for (var i = 0; i < this.multipleSelection.length; i++) {
+          if (this.multipleSelection[i].staffSid !== this.multipleSelection[this.multipleSelection.length - 1].staffSid || this.multipleSelection[i].purchaseSystemSid !== this.multipleSelection[this.multipleSelection.length - 1].purchaseSystemSid) {
+            this.$message({ showClose: true, type: 'error', message: '请选择同一采购系统和销售专员的记录' })
+            return
+          }
+        }
         this.viewState = 2
         var title = '已认款'
         this.$refs['divAdd'].showAdd(title, this.sids)

anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/simpledeposit.vue

@@ -51,6 +51,11 @@
                   <span>{{ scope.row.useOrgName }}</span>
                 </template>
               </el-table-column>
+              <el-table-column label="采购系统" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.purchaseSystemName }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="销售部门" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.staffDeptName }}</span>
@@ -152,6 +157,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [],
+      multipleSelection: [],
       listLoading: false,
       listQuery: {
         current: 1,
@@ -216,6 +222,7 @@ export default {
     // 获取数据sid
     handleSelectionChange(row) {
       const aa = []
+      this.multipleSelection = row
       row.forEach(element => {
         aa.push(element.sid)
       })
@@ -268,6 +275,12 @@ export default {
     },
     toCarryDown() {
       if (this.sids.length > 0) {
+        for (var i = 0; i < this.multipleSelection.length; i++) {
+          if (this.multipleSelection[i].staffSid !== this.multipleSelection[this.multipleSelection.length - 1].staffSid || this.multipleSelection[i].purchaseSystemSid !== this.multipleSelection[this.multipleSelection.length - 1].purchaseSystemSid) {
+            this.$message({ showClose: true, type: 'error', message: '请选择同一采购系统和销售专员的记录' })
+            return
+          }
+        }
         this.viewState = 2
         var title = '简易订单订金'
         this.$refs['divAdd'].showAdd(title, this.sids)

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.java

@@ -76,4 +76,6 @@ public interface FinFundsCarriedForwardApplyMapper extends BaseMapper<FinFundsCa
 
 	@Update("update fin_funds_carried_forward_apply set nodeState = #{nodeState} where sid = #{sid}")
     void updateNodeStateBySid(@Param("nodeState") String nodeState,@Param("sid") String sid);
+
+    String selectByBusSid(String busSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyMapper.xml

@@ -67,4 +67,25 @@
         </if>
         WHERE sid = #{sid}
     </update>
+
+    <select id="selectByBusSid" resultType="java.lang.String">
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
+        from (SELECT d.sid,
+        d.receivablesSid,
+        d.`collSid`,
+        d.auditState,
+        cast((
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0) +
+        COALESCE(ffa.`useMoney`, 0)) AS DECIMAL(10, 2)) AS dbalance
+        FROM fin_selected_receivables_detailed d
+        LEFT JOIN `fin_funds_carried_forward_veh` f ON f.`busSid` = d.`sid`
+        left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
+        LEFT JOIN (SELECT fa.sid, ff.busSid, ff.thisUseMoney as useMoney
+        FROM fin_funds_carried_forward_apply fa
+        LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
+        WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
+        WHERE d.auditState = 3
+        and ff.busVinSid = #{busVinSid}
+        GROUP BY d.`sid`) d
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -30,8 +30,12 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
+import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
@@ -53,6 +57,7 @@ import com.yxt.anrui.fin.api.finfundscarriedforwardveh.FinFundsCarriedForwardVeh
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
@@ -91,11 +96,13 @@ import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 /**
@@ -152,6 +159,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPro;
     @Autowired
     private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
+    @Autowired
+    private BaseVehicleStateFeign baseVehicleStateFeign;
 
     public PagerVo<FinFundsCarriedForwardApplyVo> listPageVo(PagerQuery<FinFundsCarriedForwardApplyQuery> pq) {
         FinFundsCarriedForwardApplyQuery query = pq.getParams();
@@ -380,11 +389,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             finFundsCarriedForwardVehDetailsVos.add(finFundsCarriedForwardVehDetailsVo);
         }
         SysUserVo sysUserVo1 = null;
-        if (finCollectionConfirmation != null) {
+        if (finCollectionConfirmation != null){
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finCollectionConfirmation.getStaffDeptSid());
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finCollectionConfirmation.getStaffDeptName());
             sysUserVo1 = sysUserFeign.fetchBySid(finCollectionConfirmation.getStaffUserSid()).getData();
-        } else {
+        }else {
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptSid(finFundsCarriedForwardApply.getSaleDeptSid());
             finFundsCarriedForwardApplyDetailsVo.setSaleDeptName(finFundsCarriedForwardApply.getSaleDeptName());
             sysUserVo1 = sysUserFeign.fetchBySid(finFundsCarriedForwardApply.getCreateBySid()).getData();
@@ -598,7 +607,8 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             if (isOneSale) {
                 dto.setIsOneSale(true);
                 String sid = saveOrUpdateAll(dto).getData();
-                String pdfPath = createPdf(sid, dto.getPdfType()).getData();
+                finFundsCarriedForwardApply = fetchBySid(sid);
+                //String pdfPath = createPdf(sid, finFundsCarriedForwardApply.getCreateByName()).getData();
                 //baseMapper.updatePathBySid(pdfPath, sid);
                 tsqtysd(sid);
                 return rb.success();
@@ -637,7 +647,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             }
             if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
                 bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
-            } else {
+            }else {
                 bv.setNextNodeUserSids(sysOrganization.getManagerSid());
             }
         } else {
@@ -861,7 +871,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     private List<TzDto> manyHB(List<TzDto> list) {
         //转出为多条，转入为一条
         List<TzDto> manyRemoveList = new ArrayList<>();
-        if (list.get(0).getTzType().equals("转出")) {
+        if (list.get(0).getTzType().equals("转出")){
             list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
                 transfer.stream().reduce((a, b) -> new TzDto(
                         a.getTzType(),
@@ -874,7 +884,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         a.getDcje() + b.getDcje(),
                         a.getDrje())).ifPresent(manyRemoveList::add);
             });
-        } else {
+        }else {
             list.parallelStream().collect(Collectors.groupingBy(tzDto -> tzDto.getCustNo(), Collectors.toList())).forEach((id, transfer) -> {
                 transfer.stream().reduce((a, b) -> new TzDto(
                         a.getTzType(),
@@ -1026,11 +1036,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 Map<String, Object> map = BeanUtil.beanToMap(ufVo);
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
-                if ("发起申请".equals(ufVo.getNodeState())) {
+                if ("发起申请".equals(ufVo.getNodeState())){
                     FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(businessSid).getData();
                     List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                     }
                 }
                 //极光推送
@@ -1078,11 +1088,11 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
                 UpdateFlowFieldVo ufv = resultBean.getData();
-                if ("发起申请".equals(ufv.getNodeState())) {
+                if ("发起申请".equals(ufv.getNodeState())){
                     FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                     List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                     }
                 }
                 return rb.success().setData(resultBean.getData());
@@ -1117,7 +1127,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                 List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                 for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                    finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                    finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                 }
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -1133,7 +1143,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                     FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(query.getBusinessSid()).getData();
                     List<AppFinFundsCarriedForwardYXYSKXVo> yxysFinFundsCarriedForwardYXYSKXVos = data.getYxysFinFundsCarriedForwardYXYSKXVos();
                     for (AppFinFundsCarriedForwardYXYSKXVo yxysFinFundsCarriedForwardYXYSKXVo : yxysFinFundsCarriedForwardYXYSKXVos) {
-                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2, yxysFinFundsCarriedForwardYXYSKXVo.getSid());
+                        finSelectedReceivablesDetailedService.updateAuditStateBySid(2,yxysFinFundsCarriedForwardYXYSKXVo.getSid());
                     }
                 }
             }
@@ -1161,7 +1171,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         }
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finFundsCarriedForwardApply.getOrgSidPath());
-        if ("Activity_1kve61q".equals(bv.getTaskDefKey())) {
+        if ("Activity_1kve61q".equals(bv.getTaskDefKey())){
             List<String> orgPathList = Arrays.asList(finFundsCarriedForwardApply.getOrgSidPath().split("/"));
             SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
             if (sysOrganization == null) {
@@ -1169,7 +1179,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             }
             if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
                 bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
-            } else {
+            }else {
                 bv.setNextNodeUserSids(sysOrganization.getManagerSid());
             }
         }
@@ -1319,7 +1329,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         return rb.success().setData(data);
     }
 
-    public ResultBean<String> createPdf(String sid, String pdfType) {
+    public ResultBean<String> createPdf(String sid, String userName) {
         ResultBean rb = ResultBean.fireFail();
         FinFundsCarriedForwardApplyDetailsVo data = fetchDetailsVoBySid(sid).getData();
         List<FinFundsCarriedForwardVehDetailsVo> finFundsCarriedForwardVehDetailsVos = data.getFinFundsCarriedForwardVehDetailsVos();
@@ -1336,7 +1346,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                         String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
                         String finishTime = (String) flowableRecordVo.get("finishTime");
                         finishTime = finishTime.substring(0, 10);
-                        if ("Activity_17mi28e".equals(taskDefKey)) {
+                        if ("Activity_1nfy3ql".equals(taskDefKey)) {
                             dataMap.put("spName", assigneeName + finishTime);
                         }
                     }
@@ -1363,7 +1373,6 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
             tzList.add(tzDto);
         }
         dataMap.put("saleDate", DateUtil.formatDate(new Date()));
-        dataMap.put("billNo", data.getBillNo());
         dataMap.put("tzList", tzList);
         dataMap.put("makeName", data.getCreateByName() + data.getCreateByDate());
         //获取模板
@@ -1375,16 +1384,12 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         String typeName = dateStr + seconds + ".doc";
         //  生成文件路径
         String targetPath = sourcePath + dateStr;
-        if (pdfType.equals("针孔式打印机")) {
+        WordUtils.creatWord(dataMap, "kxjz", sourcePath, targetPath, typeName);
-            WordUtils.creatWord(dataMap, "jzsqzks", sourcePath, targetPath, typeName);
-        } else if (pdfType.equals("激光打印机")) {
-            WordUtils.creatWord(dataMap, "jzsqjg", sourcePath, targetPath, typeName);
-        }
         //新生成的word路径
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名
         String pdfName = "款项结转_" + dateStr + seconds + ".pdf";
-        WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
+        WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
         return rb.success().setData("template/" + dateStr + "/" + pdfName);
     }
 
@@ -1420,6 +1425,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
     }
 
     public void jzComplete(String sid) {
+        List<BaseVehicleStateDto> dtoList = new ArrayList<>();
         FinFundsCarriedForwardApply finFundsCarriedForwardApply = fetchBySid(sid);
         //查询结转的款项
         List<FinFundsCarriedForwardVeh> finFundsCarriedForwardVehList = finFundsCarriedForwardVehService.selectByCollSid(sid);
@@ -1427,13 +1433,66 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
         if (!finFundsCarriedForwardVehList.isEmpty()) {
             for (FinFundsCarriedForwardVeh v : finFundsCarriedForwardVehList) {
                 String busSid = v.getBusSid();
+                FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finSelectedReceivablesDetailedService.fetchBySid(busSid);
+                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
                 //结转金额
                 //查询该车的所有认款，是否都已认完
-
+                String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) <= 0) {
+                    //已认款完成
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    dtoList.add(baseVehicleStateDto);
+                } else {
+                    //认款未完成
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    dtoList.add(baseVehicleStateDto);
+                }
+            }
+        }
+        List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.selectByOneCollSid(sid);
+        finSelectedReceivablesDetailedVos.removeAll(Collections.singleton(null));
+        if(!finSelectedReceivablesDetailedVos.isEmpty()){
+            for(FinSelectedReceivablesDetailed v : finSelectedReceivablesDetailedVos){
+                FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(v.getReceivablesSid());
+                //查询该车的所有认款，是否都已认完
+                String subscribute = baseMapper.selectByBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                String receiableMoney = finUncollectedReceivablesDetailedService.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                if (new BigDecimal(subscribute).compareTo(new BigDecimal(receiableMoney)) <= 0) {
+                    //已认款完成
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_RQ.getTypeKey());
+                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    dtoList.add(baseVehicleStateDto);
+                } else {
+                    //认款未完成
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.FIN_WRQ.getTypeKey());
+                    baseVehicleStateDto.setBusSid(finUncollectedReceivablesDetailed.getBusVinSid());
+                    dtoList.add(baseVehicleStateDto);
+                }
 
             }
 
         }
-
+        //==============================修改车辆的持久状态组装数据
+        try {
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("demo-pool-%d").build();
+            ExecutorService pool = new ThreadPoolExecutor(2, 100,
+                    0L, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+            Future future1 = pool.submit(() -> {
+                if (!dtoList.isEmpty()) {
+                    ResultBean busVehicleStateResultBean = baseVehicleStateFeign.saveOrUpdate(dtoList);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 }

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

@@ -162,4 +162,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     IPage<FinSelectReceivablesDetailedVo> selectPageLists(IPage<FinSelectedReceivablesPaymentDetailsQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
 
     FinSelectedReceivablesDetailed fetchYeBySid(String busSid);
+
+    List<FinSelectedReceivablesDetailed> selectByOneCollSid(String sid);
 }

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

@@ -190,10 +190,10 @@
                                   FROM fin_funds_carried_forward_apply fa
                                            LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
                                   WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
-        WHERE d.auditState = #{state}
+              WHERE d.auditState = #{state}
-          and ff.busVinSid = #{busVinSid}
+                and ff.busVinSid = #{busVinSid}
-          and d.contractNo = #{contractNo}
+                and d.contractNo = #{contractNo}
-        GROUP BY d.`sid`) d
+              GROUP BY d.`sid`) d
     </select>
 
     <select id="getList"
@@ -560,6 +560,14 @@
                                            LEFT JOIN fin_funds_carried_forward_veh ff ON ff.mainSid = fa.sid
                                   WHERE fa.nodeState = '终止') ffa on ffa.busSid = d.sid
               WHERE d.auditState = 3
-              GROUP BY d.`sid`) d WHERE d.receivablesSid = #{receivablesSid}
+              GROUP BY d.`sid`) d
+        WHERE d.receivablesSid = #{receivablesSid}
+    </select>
+
+    <select id="selectByOneCollSid"
+            resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
+        select *
+        from fin_selected_receivables_detailed
+        where collSid = #{sid}
     </select>
 </mapper>

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

@@ -634,4 +634,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
     public FinSelectedReceivablesDetailed fetchYeBySid(String busSid) {
         return baseMapper.fetchYeBySid(busSid);
     }
+
+    public List<FinSelectedReceivablesDetailed> selectByOneCollSid(String sid) {
+        return baseMapper.selectByOneCollSid(sid);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -102,4 +102,6 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     List<String> selectByCreateBySidOne(String userSid);
 
     List<String> selectSidBybusVinSidAndConNo(@Param("busVinSid") String busVinSid, @Param("contractNo") String contractNo);
+
+    String selectByBusVinSid(String busVinSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -211,4 +211,8 @@
         WHERE busVinSid = #{busVinSid}
           and contractNo = #{contractNo}
     </select>
+
+    <select id="selectByBusVinSid" resultType="java.lang.String">
+        select sum(reveivableMoney) from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -977,4 +977,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         List<String> stringList = baseMapper.selectByCreateBySidOne(userSid);
         return rb.success().setData(stringList);
     }
+
+    public String selectByBusVinSid(String busVinSid) {
+        return baseMapper.selectByBusVinSid(busVinSid);
+    }
 }

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@@ -31,6 +31,34 @@
                 <el-date-picker v-model="queryParams.params.endDate" type="date" placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
+              <el-form-item label="订单日期">
+                <el-date-picker v-model="queryParams.params.orderStartDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.orderEndDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="预计上线日期">
+                <el-date-picker v-model="queryParams.params.yjsxStartDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.yjsxEndDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="上线日期">
+                <el-date-picker v-model="queryParams.params.sxStartDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.sxEndDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="下线日期">
+                <el-date-picker v-model="queryParams.params.xxStartDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.xxEndDate" type="date" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" size="small" @click="dosearch">查询</el-button>
@@ -161,7 +189,15 @@ export default {
           staffSid: '',
           userSid: '',
           applicationCode: '',
-          orgPath: ''
+          orgPath: '',
+          xxEndDate: '',
+          xxStartDate: '',
+          sxEndDate: '',
+          sxStartDate: '',
+          yjsxEndDate: '',
+          yjsxStartDate: '',
+          orderEndDate: '',
+          orderStartDate: ''
         }
       },
       formobj: {
@@ -248,7 +284,15 @@ export default {
           staffSid: '',
           userSid: '',
           applicationCode: '',
-          orgPath: ''
+          orgPath: '',
+          xxEndDate: '',
+          xxStartDate: '',
+          sxEndDate: '',
+          sxStartDate: '',
+          yjsxEndDate: '',
+          yjsxStartDate: '',
+          orderEndDate: '',
+          orderStartDate: ''
         }
       }
       this.dosearch()

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

@@ -1,10 +1,11 @@
 <template>
   <div class="app-container">
     <!--Start 列表页面-->
-    <div>
+    <div v-show="viewState == 1">
       <div class="tab-header webtop">
         <div>关联公告型号</div>
         <div>
+          <el-button type="primary" size="small" @click="handleAdd()">新增公告型号</el-button>
           <el-button type="primary" size="small" @click="handleConfirm()">确认</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
@@ -75,6 +76,7 @@
         </div>
       </div>
     </div>
+    <gonggaoAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
   </div>
 </template>
 
@@ -82,15 +84,18 @@
 import { getList, setRel } from '@/api/cheliang/baseaffichemodel'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import gonggaoAdd from '../../../othermenu/affichetype/gonggaoAdd'
 
 export default {
   name: 'changyongpeizhiguanlian',
   components: {
     Pagination,
-    pageye
+    pageye,
+    gonggaoAdd
   },
   data() {
     return {
+      viewState: 1,
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
       // 查询 -----------
@@ -186,6 +191,10 @@ export default {
       this.listQuery.params.announcementmodelName = ''
       this.getList()
     },
+    handleAdd() {
+      this.viewState = 2
+      this.$refs['divAdd'].showAdd()
+    },
     handleConfirm() {
       if (this.sids.length === 0) {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行关联' })
@@ -197,6 +206,9 @@ export default {
           this.handleReturn('true')
         }
       })
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengInfo.vue

@@ -22,17 +22,17 @@
           <el-col :span="8"> {{ temp.toCardDate }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">领取日期：</el-col>
+          <el-col :span="4" class="trightb">借用日期：</el-col>
           <el-col :span="8" class="tleft"> {{ temp.receiveDate }}</el-col>
-          <el-col :span="4" class="trightb">领取人：</el-col>
+          <el-col :span="4" class="trightb">借用人：</el-col>
           <el-col :span="8"> {{ temp.receiver }}</el-col>
         </el-row>
-        <el-row>
+<!--        <el-row>-->
-          <el-col :span="4" class="trightb">接收日期：</el-col>
+<!--          <el-col :span="4" class="trightb">接收日期：</el-col>-->
-          <el-col :span="8" class="tleft"> {{ temp.acceptDate }}</el-col>
+<!--          <el-col :span="8" class="tleft"> {{ temp.acceptDate }}</el-col>-->
-          <el-col :span="4" class="trightb">接收人：</el-col>
+<!--          <el-col :span="4" class="trightb">接收人：</el-col>-->
-          <el-col :span="8"> {{ temp.acceptName }}</el-col>
+<!--          <el-col :span="8"> {{ temp.acceptName }}</el-col>-->
-        </el-row>
+<!--        </el-row>-->
         <el-row>
           <el-col :span="4" class="trightb">移交状态：</el-col>
           <el-col :span="8" class="tleft"> {{ temp.transferStateValue }}</el-col>

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhang.vue

@@ -83,26 +83,26 @@
                 <span>{{ scope.row.toCardDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="领取日期" width="140px" align="center">
+            <el-table-column label="借用日期" width="140px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.receiveDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="领取人" width="110px" align="center">
+            <el-table-column label="借用人" width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.receiver }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="接收日期" width="140px" align="center">
+<!--            <el-table-column label="接收日期" width="140px" align="center">-->
-              <template slot-scope="scope">
+<!--              <template slot-scope="scope">-->
-                <span>{{ scope.row.acceptDate }}</span>
+<!--                <span>{{ scope.row.acceptDate }}</span>-->
-              </template>
+<!--              </template>-->
-            </el-table-column>
+<!--            </el-table-column>-->
-            <el-table-column label="接收人" width="110px" align="center">
+<!--            <el-table-column label="接收人" width="110px" align="center">-->
-              <template slot-scope="scope">
+<!--              <template slot-scope="scope">-->
-                <span>{{ scope.row.acceptName }}</span>
+<!--                <span>{{ scope.row.acceptName }}</span>-->
-              </template>
+<!--              </template>-->
-            </el-table-column>
+<!--            </el-table-column>-->
             <el-table-column label="备注" width="370px" header-align="center" align="left">
               <template slot-scope="scope">
                 <span>{{ scope.row.remarks }}</span>

anrui-scm/anrui-scm-ui/src/views/cheliang/hegezhengtaizhang/hegezhengtaizhangAdd.vue

@@ -43,31 +43,31 @@
         <el-row>
           <el-col :span="12">
             <el-form-item prop="receiveDate">
-              <span slot="label">领取日期：</span>
+              <span slot="label">借用日期：</span>
               <el-date-picker v-model="temp.receiveDate" type="date" class="addinputw" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期时间"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item prop="receiver">
-              <span slot="label">领取人：</span>
+              <span slot="label">借用人：</span>
               <el-input v-model="temp.receiver" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+<!--        <el-row>-->
-          <el-col :span="12">
+<!--          <el-col :span="12">-->
-            <el-form-item prop="receiveDate">
+<!--            <el-form-item prop="receiveDate">-->
-              <span slot="label">接收日期：</span>
+<!--              <span slot="label">接收日期：</span>-->
-              <el-date-picker v-model="temp.acceptDate" type="date" class="addinputw" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期时间"/>
+<!--              <el-date-picker v-model="temp.acceptDate" type="date" class="addinputw" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期时间"/>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
-          <el-col :span="12">
+<!--          <el-col :span="12">-->
-            <el-form-item prop="receiver">
+<!--            <el-form-item prop="receiver">-->
-              <span slot="label">接收人：</span>
+<!--              <span slot="label">接收人：</span>-->
-              <el-input v-model="temp.acceptName" maxlength="125" placeholder="" class="addinputw" clearable/>
+<!--              <el-input v-model="temp.acceptName" maxlength="125" placeholder="" class="addinputw" clearable/>-->
-            </el-form-item>
+<!--            </el-form-item>-->
-          </el-col>
+<!--          </el-col>-->
-        </el-row>
+<!--        </el-row>-->
         <el-row>
           <el-col :span="12">
             <el-form-item prop="remarks">

doc/databases/base_tables.sql

@@ -993,6 +993,8 @@ CREATE TABLE `base_vehicle_state`
     `carryInvoiceState` varchar(64)          DEFAULT NULL COMMENT '欠款开票状态',
     `packageBusiness`   varchar(64)          DEFAULT NULL COMMENT '包牌业务',
     `contractState`     varchar(64)          DEFAULT NULL COMMENT '合同状态',
+    `saleTypeKey`       varchar(64)          DEFAULT NULL COMMENT '销售类型：1全款，2贷款',
+    `finSourceKey`      varchar(64)          DEFAULT NULL COMMENT '款项来源：1自有资金、2三方金融、3担保、4非担保',
     PRIMARY KEY (`id`),
     KEY `id` (`id`)
 ) ENGINE = INNODB