逾期对账申请资方

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankDetailVo.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.riskcenter.api.loanoverduebank;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yxt.anrui.riskcenter.api.loanoverduebankdetails.LoanOverdueBankDetailsDto;
+import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -35,7 +36,8 @@ public class LoanOverdueBankDetailVo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("附件")
-    private List<String> filesList = new ArrayList<>();
+//    private List<String> filesList = new ArrayList<>();
+    private List<UrlQuery> filesList = new ArrayList<>();
     private List<LoanOverdueBankDetailsDto> detailsVoList = new ArrayList<>();
 
     @JsonIgnore

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebank/LoanOverdueBankVo.java

@@ -34,4 +34,10 @@ public class LoanOverdueBankVo implements Vo {
     @ApiModelProperty("是否允许点击办理，true允许，false不允许")
     private boolean allowModify;
     private String createBySid;
+
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetails.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanoverduebankdetails;
 
+import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ import java.math.BigDecimal;
  * @date: 2023/12/26
  **/
 @Data
-public class LoanOverdueBankDetails {
+public class LoanOverdueBankDetails extends BaseEntity {
 
     private String mainSid;
     @ApiModelProperty("贷款合同编号")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduebankdetails/LoanOverdueBankDetailsDto.java

@@ -31,8 +31,8 @@ public class LoanOverdueBankDetailsDto {
     @ApiModelProperty("资方")
     private String bankName;
 
-    @ApiModelProperty("资方sid")
+    /*@ApiModelProperty("资方sid")
-    private String bankSid;
+    private String bankSid;*/
     @ApiModelProperty("期数")
     private String period;
     @ApiModelProperty("平台逾期月还")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/LoanOverdueFinVo.java

@@ -34,4 +34,9 @@ public class LoanOverdueFinVo implements Vo {
     @ApiModelProperty("是否允许点击办理，true允许，false不允许")
     private boolean allowModify;
     private String createBySid;
+
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanoverduefin/flowable/CompleteDto.java

@@ -1,10 +1,13 @@
 package com.yxt.anrui.riskcenter.api.loanoverduefin.flowable;
 
+import com.yxt.anrui.riskcenter.api.loanoverduefindetails.LoanOverdueFinDetailsDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @description:
@@ -34,4 +37,6 @@ public class CompleteDto implements Dto {
     @ApiModelProperty(value = "业务sid")
     @NotBlank(message = "参数错误：businessSid")
     private String businessSid;
+
+
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -10,7 +10,8 @@
                lob.createDept,
                lob.createDeptSid,
                lob.orgSidPath                             orgPath,
-               lob.stopDate
+               lob.stopDate,
+               DATE_FORMAT(lob.createTime, '%Y-%m-%d') as createDate
         from loan_overdue_bank lob
         where sid = #{sid}
     </select>
@@ -42,16 +43,17 @@
 
     <select id="selectPageVo" resultType="com.yxt.anrui.riskcenter.api.loanoverduebank.LoanOverdueBankVo">
         select lob.sid,
-               lob.nodeState,
                lob.useOrgName,
                lob.createDept,
-               lob.createByName,
                DATE_FORMAT(lob.createTime, '%Y-%m-%d')             as createTime,
                lob.closeDate,
                lob.stopDate,
                lob.remarks,
                lob.createBySid,
-               if(length(lob.nodeState) > 0, lob.nodeState, '待提交') as nodeState
+               if(length(lob.nodeState) > 0, lob.nodeState, '待提交') as nodeState,
+               lob.procDefId,
+               lob.procInstId,
+               lob.createByName
         from loan_overdue_bank lob
         <where>
             ${ew.sqlSegment}
@@ -63,17 +65,18 @@
         <!--贷款合同编号-->
         a1.`loanContractNo`,
         <!--贷款人-->
-        a1.borrowerName,
+        a1.borrowerName loanName,
+        a1.borrowerSid  loanSid,
         <!--资方-->
         a1.`bankName`,
         <!--资方合同编号-->
         a1.`bankContractNo`,
         <!--逾期期数-->
-        COUNT(a1.sid) AS beOverduePeriod,
+        COUNT(a1.sid) AS period,
         <!--逾期金额-->
-        SUM(a1.yq_total) AS beOverdueMoney,
+        SUM(a1.yq_total) AS overdueMoney,
         a1.customerSid,
-        a1.customer
+        a1.customer         customerName
         FROM (SELECT lrpd.sid,
 
                      lrpd.`loanContractNo`,
@@ -86,7 +89,8 @@
                          lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0))
                          ) AS yq_total,
                      lrpd.customer,
-                     lrpd.customerSid
+                     lrpd.customerSid,
+                     lrpd.borrowerSid
               FROM `loan_repayment_plan_details` lrpd
                        LEFT JOIN `loan_repayment_history` lrh
                                  ON lrh.planDetailSid = lrpd.`sid`

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java

@@ -254,7 +254,9 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                loanOverdueBank = fetchBySid(businessSid);
+                loanOverdueBank.setCloseDate(DateUtil.today());
+                baseMapper.updateById(loanOverdueBank);
             } else {
                 //极光推送
                 loanOverdueBank = fetchBySid(businessSid);
@@ -307,7 +309,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         bv.setFormVariables(variables);
         if (r == 1) {
             //ToDo:流程定义id
-            bv.setModelId(ProcDefEnum.LOANOVERDUEFIN.getProDefId());
+            bv.setModelId(ProcDefEnum.LOANOVERDUEBANK.getProDefId());
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());
@@ -396,26 +398,6 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         return rb.success().setMsg("删除成功");
     }
 
-    public ResultBean<LoanOverdueBankDetailVo> details(String sid) {
-        ResultBean<LoanOverdueBankDetailVo> rb = ResultBean.fireFail();
-        LoanOverdueBank loanOverdueBank = fetchBySid(sid);
-        if (loanOverdueBank == null) {
-            return rb.setMsg("该申请不存在");
-        }
-        LoanOverdueBankDetailVo loanOverdueBankDetailVo = baseMapper.details(sid);
-        List<LoanOverdueBankDetailsDto> detailsVoList = loanOverdueBankDetailsService.selectByMainSid(sid);
-        detailsVoList.removeAll(Collections.singleton(null));
-        if (!detailsVoList.isEmpty()) {
-            loanOverdueBankDetailVo.setDetailsVoList(detailsVoList);
-        }
-        String files = loanOverdueBankDetailVo.getFiles();
-        if (StringUtils.isNotBlank(files)) {
-            List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
-            loanOverdueBankDetailVo.setFilesList(fileList);
-        }
-        return rb.success().setData(loanOverdueBankDetailVo);
-    }
-
     public ResultBean<String> saveOrUpdateBank(LoanOverdueBankDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -629,10 +611,21 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
             if (!detailsVoList.isEmpty()) {
                 loanOverdueBankDetailVo.setDetailsVoList(detailsVoList);
             }
-            String files = loanOverdueBankDetailVo.getFiles();
+           /* String files = loanOverdueBankDetailVo.getFiles();
             if (StringUtils.isNotBlank(files)) {
                 List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
                 loanOverdueBankDetailVo.setFilesList(fileList);
+            }*/
+            String files = loanOverdueBankDetailVo.getFiles();
+            List<UrlQuery> list = new ArrayList<>();
+            if (StringUtils.isNotBlank(files)) {
+                List<String> fileList = Arrays.asList(files.split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
+                for (int i = 0; i < fileList.size(); i++) {
+                    UrlQuery urlQuery = new UrlQuery();
+                    urlQuery.setUrl(fileList.get(i));
+                    list.add(urlQuery);
+                }
+                loanOverdueBankDetailVo.setFilesList(list);
             }
             loanOverdueBankDetailVo.setOrgPath(loanOverdueBank.getOrgSidPath());
             loanOverdueBankDetailVo.setTaskId(loanOverdueBank.getTaskId());
@@ -707,7 +700,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
                     }
                     String temp = getCellVal(row.getCell(i)).toString().trim();
                     temp = temp.replace(".0", "");
-                    for (int j = 0; j < temp.length(); j++) {
+                    for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
                                 case 0:

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -11,7 +11,9 @@
                lof.closeDate,
                lof.stopDate,
                lof.remarks,
-               lof.createBySid
+               lof.createBySid,
+               lof.procInstId,
+               lof.procDefId
         from loan_overdue_fin lof
         <where>
             ${ew.sqlSegment}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@@ -394,7 +395,9 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                loanOverdueFin = fetchBySid(businessSid);
+                loanOverdueFin.setCloseDate(DateUtil.today());
+                baseMapper.updateById(loanOverdueFin);
             } else {
                 //极光推送
                 loanOverdueFin = fetchBySid(businessSid);
@@ -710,7 +713,7 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
                     }
                     String temp = getCellVal(row.getCell(i)).toString().trim();
                     temp = temp.replace(".0", "");
-                    for (int j = 0; j < temp.length(); j++) {
+                    for (int j = 0; j < resultCell.length; j++) {
                         if (i == resultCell[j]) {
                             switch (i) {
                                 case 0:

doc/databases/统计报表更新.sql

@@ -1,7 +1,7 @@
 CREATE
     DEFINER = `root`@`%` PROCEDURE `pro_daily_report_update`()
 BEGIN
-    -- 更新库存-未定
+    -- 更新库存-未定(库存状态不是出库0002且不是内销0007、且不是退库0004的。非删除、销售订单未锁定)
     UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid`
                                       FROM anrui_base.`base_vehicle`
                                       WHERE vehicleState <> '0002'
@@ -13,7 +13,8 @@ BEGIN
                 r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid
     SET r.`stock_unreserve`=s.scount
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-    -- 更新库存-已定
+
+    -- 更新库存-已定（库存状态不是出库0002且不是内销0007且不是退库0004的，非删除，锁定状态为销售订单锁定02）
     UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid`
                                       FROM anrui_base.`base_vehicle`
                                       WHERE vehicleState <> '0002'
@@ -29,7 +30,8 @@ BEGIN
     UPDATE daily_report
     SET stock_subtotal=stock_unreserve + stock_reserve
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-    -- 更新库存-买断-未定
+
+    -- 更新库存-买断-未定（库存状态不是出库0002且不是内销0007且不是退库0004的，非删除，非销售订单锁定、已买断）
     UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid`
                                       FROM anrui_base.`base_vehicle`
                                       WHERE vehicleState <> '0002'
@@ -42,7 +44,7 @@ BEGIN
                 r.useOrgSid = s.useOrgSid AND r.vehModelSid = s.modelSid AND r.vehMConfigSid = s.modelConfigSid
     SET r.`stock_buyout_unreserve`=s.scount
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-    -- 更新库存-买断-已定
+    -- 更新库存-买断-已定（库存状态不是出库0002且不是内销0007且不是退库0004的，非删除，销售订单锁定，已买断）
     UPDATE daily_report r INNER JOIN (SELECT COUNT(id) AS scount, `useOrgSid`, `modelSid`, `modelConfigSid`
                                       FROM anrui_base.`base_vehicle`
                                       WHERE vehicleState <> '0002'
@@ -59,7 +61,7 @@ BEGIN
     UPDATE daily_report
     SET `stock_buyout_subtotal`=`stock_buyout_unreserve` + `stock_buyout_reserve`
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
--- 更新库存-排产-未定
+-- 更新库存-排产-未定（排产订单中未入库，且未被销售订单锁定）
     UPDATE daily_report r
         INNER JOIN (
             select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid
@@ -67,8 +69,10 @@ BEGIN
                      select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid
                      from anrui_base.bus_vehicle_apply bo
                               left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid
+                              left join anrui_base.bus_vehicle_order bbo on bbo.purchaseRequisitionSid = bo.sid
                      where (si.nodeState != '已办结' and si.nodeState != '终止')
                        and bo.isDelete <> 1
+                       and bo.applyTypeKey = '001'
                        and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
                      group by bo.createOrgSid
                      union all
@@ -84,6 +88,14 @@ BEGIN
                        and bo.orderStatus != '已作废'
                        and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
                      group by bo.createOrgSid
+                     union all
+                     (select ifnull(sum(si.num), 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid
+                      from anrui_base.bus_vehicle_apply bo
+                               left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid
+                      where (si.nodeState != '已办结' and si.nodeState != '终止')
+                        and bo.isDelete <> 1
+                        and bo.applyTypeKey = '004'
+                      group by bo.createOrgSid)
                  ) as v
             GROUP BY v.`useOrgSid`,
                      v.`modelSid`,
@@ -94,8 +106,7 @@ BEGIN
     SET r.`pcOrder_unreserve` = s.scount
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
--- 更新库存-排产已定
+-- 更新库存-排产已定（未入库且被销售订单锁定的台数）
-
     UPDATE daily_report r
         INNER JOIN (
             select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid
@@ -135,7 +146,7 @@ BEGIN
     SET pcOrder_subtotal=pcOrder_reserve + pcOrder_unreserve
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
--- 简易订单-每日
+-- 简易订单-每日（简易订单今日已办结的）
 
     UPDATE daily_report r
         INNER JOIN (select count(bbv.id) as scount, bbv.modelSid, bbv.modelConfigSid, bbm.orgSid useOrgSid
@@ -153,7 +164,7 @@ BEGIN
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 
--- 简易订单-每月
+-- 简易订单-每月（简易订单本月已办结的）
 
     UPDATE daily_report r
         INNER JOIN (select count(bbv.id) as scount, bbv.modelSid, bbv.modelConfigSid, bbm.orgSid useOrgSid
@@ -244,7 +255,7 @@ BEGIN
     SET saleOrder_subtotal_month=saleOrder_loan_month + saleOrder_full_month
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
--- 销售订单-待交车累计
+-- 销售订单-待交车累计（销售订单已办结且库存状态为库存和在途的）
     UPDATE daily_report r
         INNER JOIN (select count(bv.id) as scount, bv.useOrgSid, bv.modelSid, bv.modelConfigSid, bo.contractNo
                     from anrui_base.base_vehicle bv
@@ -259,7 +270,7 @@ BEGIN
     SET r.`saleOrder_waitVeh_total` = s.scount
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
--- 本日销售全款
+-- 本日销售全款（销售日期为本日、全款、主车（包含value为空的））
     UPDATE daily_report r
         INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
                     from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
@@ -277,7 +288,7 @@ BEGIN
             AND r.vehMConfigSid = s.modelConfigSid
     SET r.`sale_full_day` = s.scount
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
--- 本日销售贷款
+-- 本日销售贷款（贷款、销售日期为本日、主车（包含value为空的））
     UPDATE daily_report r
         INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
                     from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
@@ -302,7 +313,7 @@ BEGIN
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 
--- 本月销售全款
+-- 本月销售全款（全款、销售日期本月、主车（包含value为空的））
     UPDATE daily_report r
         INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
                     from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
@@ -320,7 +331,7 @@ BEGIN
             AND r.vehMConfigSid = s.modelConfigSid
     SET r.`sale_full_month` = s.scount
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
--- 本月销售贷款
+-- 本月销售贷款（贷款、销售日期为本月、主车（包含value为空的））
     UPDATE daily_report r
         INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
                     from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
@@ -345,7 +356,7 @@ BEGIN
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 
--- 本年销售全款
+-- 本年销售全款（全款、销售日期为本年、主车（包含value为空的））
     UPDATE daily_report r
         INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
                     from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
@@ -363,7 +374,7 @@ BEGIN
             AND r.vehMConfigSid = s.modelConfigSid
     SET r.`sale_full_year` = s.scount
     WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
--- 本年销售贷款
+-- 本年销售贷款（贷款、销售日期本年、主车（value为空的）））
     UPDATE daily_report r
         INNER JOIN (select sum(ss.scount) as scount, ss.modelSid, ss.modelConfigSid, ss.useOrgSid
                     from (select count(bv.id) as scount, bv.modelSid, bv.modelConfigSid, bv.useOrgSid
@@ -618,7 +629,7 @@ BEGIN
     set stock_total = (stock_subtotal + pcOrder_subtotal)
     where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
--- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数
+-- 欠款出库数量--截止当日欠款出库申请通过且未回清款的台数（欠款出库申请通过，且未认完款的台数总和加上欠款提车申请通过，且全款已出库未认完款的台数总和）
     update daily_report r inner join (SELECT SUM(cc.scount) AS scount,
                                              cc.useOrgSid,
                                              cc.vehMConfigSid,
@@ -744,7 +755,7 @@ BEGIN
     where DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
 
 
--- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额
+-- 欠款出库金融--截止当日欠款出库申请通过且未回清款的台数欠款总额（欠款出库申请通过，且未认完款的剩余认款总和加上欠款提车申请通过，且全款已出库未认完款的剩余认款总和）
     update daily_report r inner join (SELECT sum(cc.scount) AS scount,
                                              cc.useOrgSid,
                                              cc.vehMConfigSid,