Merge remote-tracking branch 'origin/master'

2 years ago · 607e813761
22 changed files with 115 additions and 50 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java
@ -32,7 +32,8 @@ public class BaseInfoDto implements Dto {
    private String managementDetailAddress;

    @ApiModelProperty(value = "实际经营地址code")
-    private String managementDetailAddressCode;
+//    private String managementDetailAddressCode;
+    private String managementAddressCode;

    @ApiModelProperty(value = "实际经营地址省")
    private String managementDetailAddressProvince;
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
@ -616,10 +616,10 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
        vo.setInvoiceInfo(baseInvoiceInfoVo);
        BaseFileVo baseFileVo = new BaseFileVo();
        //附件清单
-        List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001");
-        List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002");
-        List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003");
-        List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004");
+        List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "营业执照");
+        List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "道路运输许可证");
+        List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "法人身份证");
+        List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "其他资料");
        baseFileVo.setBusinessLicense(businessLicense);
        baseFileVo.setOtherInfo(otherInfo);
        baseFileVo.setCorporateIdCard(corporateIdCard);
@ -804,10 +804,10 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
            return rb.setMsg("该经销商不存在");
        }
        BaseFileVo vo = new BaseFileVo();
-        List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001");
-        List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002");
-        List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003");
-        List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004");
+        List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "营业执照");
+        List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "道路运输许可证");
+        List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "法人身份证");
+        List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "其他资料");
        vo.setBusinessLicense(businessLicense);
        vo.setOtherInfo(otherInfo);
        vo.setCorporateIdCard(corporateIdCard);
@ -828,17 +828,17 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
        List<String> corporateIdCard = dto.getCorporateIdCard();
        List<String> otherInfo = dto.getOtherInfo();
        if (!businessLicense.isEmpty()) {//0001
-            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), businessLicense, "0001");
+            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), businessLicense, "营业执照");
        }
        if (!transportPermit.isEmpty()) {//0002
-            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), transportPermit, "0002");
+            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), transportPermit, "道路运输许可证");

        }
        if (!corporateIdCard.isEmpty()) {//0003
-            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), corporateIdCard, "0003");
+            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), corporateIdCard, "法人身份证");
        }
        if (!otherInfo.isEmpty()) {//0004
-            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), otherInfo, "0004");
+            baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), otherInfo, "其他资料");

        }
        return rb.success();
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml
@ -42,7 +42,7 @@
        select *
        from base_vehinstall
        where useOrgSid = #{useOrgSid}
-          and vinNo = #{vinNo}
+          and vinNo like concat('%',#{vinNo},'%')
    </select>

    <select id="seletByVinAndUseOrg" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue
@ -229,7 +229,7 @@ export default {
        procInsId: row.procInstId,
        token: getStorage()
      }
-      this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
    },
    // ========== 初始化加载 ==========
    init() {
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue
@ -26,7 +26,7 @@
          </el-table-column>
          <el-table-column label="本次赠送数量" align="center" width="200">
            <template slot-scope="scope">
-              <el-input :disabled="scope.row.discountLeaveNum == '0'" v-model="scope.row.discountNum" placeholder=""/>
+              <el-input :disabled="scope.row.discountLeaveNum == '0'" @change="changeByDiscountNum($event, scope.row)" v-model="scope.row.discountNum" placeholder=""/>
            </template>
          </el-table-column>
        </el-table>
@ -105,6 +105,13 @@ export default {
      this.list = aa
      this.vinSid = vinSid
    },
+    changeByDiscountNum(val, row) {
+      if (parseInt(row.discountLeaveNum) - parseInt(val) < 0) {
+        row.discountNum = row.discountLeaveNum
+      } else {
+        row.discountNum = val
+      }
+    },
    doCreate() {
      for (var i = 0; i < this.list.length; i++) {
        if (this.list[i].discountNum === '') {
@ -115,7 +122,7 @@ export default {
    },
    doClose() {
      this.$emit('doback')
-    },
+    }
  }
 }
 </script>
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue
@ -43,9 +43,11 @@
            <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
            <el-table-column label="操作" width="180" align="center">
              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
-                <div class="upload_img">
-                  <uploadFile ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="backData(scope.row)" :upload-data="{type:'0001'}"></uploadFile>
+                <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
+                  <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
+                  <div style="padding-left: 10px">
+                    <uploadFile ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="backData(scope.row)" :upload-data="{type:'0001'}"></uploadFile>
+                  </div>
                </div>
              </template>
            </el-table-column>
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue
@ -26,7 +26,7 @@
          </el-table-column>
          <el-table-column label="本次赠送数量" align="center" width="200">
            <template slot-scope="scope">
-              <el-input v-model="scope.row.discountNum" placeholder=""/>
+              <el-input v-model="scope.row.discountNum" @change="changeByDiscountNum($event, scope.row)" placeholder=""/>
            </template>
          </el-table-column>
        </el-table>
@ -105,6 +105,13 @@ export default {
      this.list = aa
      this.vinSid = vinSid
    },
+    changeByDiscountNum(val, row) {
+      if (parseInt(row.discountLeaveNum) - parseInt(val) < 0) {
+        row.discountNum = row.discountLeaveNum
+      } else {
+        row.discountNum = val
+      }
+    },
    doCreate() {
      for (var i = 0; i < this.list.length; i++) {
        if (this.list[i].discountNum === '') {
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
@ -660,9 +660,6 @@ export default {
  align-items: center;
  margin-bottom: 1px;
 }
-.addinputInfo {
-  margin-left: 120px !important;
-}
 .tlineheightb {
  display: flex;
  flex-direction: row;
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionAdd.vue
@ -90,7 +90,7 @@
          </el-table-column>
          <el-table-column label="合格证状态" align="center">
            <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
            </template>
          </el-table-column>
        </el-table>
@ -154,7 +154,7 @@
          </el-table-column>
          <el-table-column label="合格证" align="center">
            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row)">查看</span>
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
            </template>
          </el-table-column>
        </el-table>
@ -293,8 +293,9 @@ export default {
      })
    },
    handleLook(row) {
+      this.srcList = []
      this.dialogVisible = true
-      this.srcList = row.hgzImageUrl
+      this.srcList = row
    },
    totalBillMoney() {
      var aa = 0
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearscollection/arrearscollectionInfo.vue
@ -86,7 +86,7 @@
          </el-table-column>
          <el-table-column label="合格证状态" align="center">
            <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
            </template>
          </el-table-column>
        </el-table>
@ -150,7 +150,7 @@
          </el-table-column>
          <el-table-column label="合格证" align="center">
            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row)">查看</span>
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
            </template>
          </el-table-column>
        </el-table>
@ -265,8 +265,9 @@ export default {
      return aa
    },
    handleLook(row) {
+      this.srcList = []
      this.dialogVisible = true
-      this.srcList = row.hgzImageUrl
+      this.srcList = row
    },
    // 关闭、返回到列表页面
    handleReturn() {
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue
@ -88,7 +88,7 @@
          </el-table-column>
          <el-table-column label="合格证状态" align="center">
            <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
            </template>
          </el-table-column>
        </el-table>
@ -152,7 +152,7 @@
          </el-table-column>
          <el-table-column label="合格证" align="center">
            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row)">查看</span>
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
            </template>
          </el-table-column>
        </el-table>
@ -335,8 +335,9 @@ export default {
      })
    },
    handleLook(row) {
+      this.srcList = []
      this.dialogVisible = true
-      this.srcList = row.hgzImageUrl
+      this.srcList = row
    },
    totalBillMoney() {
      var aa = 0
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue
@ -88,7 +88,7 @@
          </el-table-column>
          <el-table-column label="合格证状态" align="center">
            <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
            </template>
          </el-table-column>
        </el-table>
@ -152,7 +152,7 @@
          </el-table-column>
          <el-table-column label="合格证" align="center">
            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row)">查看</span>
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
            </template>
          </el-table-column>
        </el-table>
@ -356,8 +356,9 @@ export default {
      return aa
    },
    handleLook(row) {
+      this.srcList = []
      this.dialogVisible = true
-      this.srcList = row.hgzImageUrl
+      this.srcList = row
    },
    getUrl() {
      if (this.image_list1.length > 0) {
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue
@ -88,7 +88,7 @@
          </el-table-column>
          <el-table-column label="合格证状态" align="center">
            <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
            </template>
          </el-table-column>
        </el-table>
@ -152,7 +152,7 @@
          </el-table-column>
          <el-table-column label="合格证" align="center">
            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row)">查看</span>
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
            </template>
          </el-table-column>
        </el-table>
@ -342,8 +342,9 @@ export default {
      return aa
    },
    handleLook(row) {
+      this.srcList = []
      this.dialogVisible = true
-      this.srcList = row.hgzImageUrl
+      this.srcList = row
    },
    // 同意
    openAgree(val) {
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionEdit.vue
@ -89,7 +89,7 @@
          </el-table-column>
          <el-table-column label="合格证状态" align="center">
            <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
            </template>
          </el-table-column>
        </el-table>
@ -153,7 +153,7 @@
          </el-table-column>
          <el-table-column label="合格证" align="center">
            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row)">查看</span>
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
            </template>
          </el-table-column>
        </el-table>
@ -302,8 +302,9 @@ export default {
      return aa
    },
    handleLook(row) {
+      this.srcList = []
      this.dialogVisible = true
-      this.srcList = row.hgzImageUrl
+      this.srcList = row
    },
    handleSave() {
      this.$refs['form_obj'].validate((valid) => {
--- a/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue
+++ b/anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue
@ -86,7 +86,7 @@
          </el-table-column>
          <el-table-column label="合格证状态" align="center">
            <template slot-scope="scope">
-              <span>{{ scope.row.certificateStateValue }}</span>
+              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
            </template>
          </el-table-column>
        </el-table>
@ -150,7 +150,7 @@
          </el-table-column>
          <el-table-column label="合格证" align="center">
            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row)">查看</span>
+              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
            </template>
          </el-table-column>
        </el-table>
@ -299,8 +299,9 @@ export default {
      return aa
    },
    handleLook(row) {
+      this.srcList = []
      this.dialogVisible = true
-      this.srcList = row.hgzImageUrl
+      this.srcList = row
    },
    /** 确认撤回任务 */
    openRevoke() {
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java
@ -138,6 +138,8 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
    private String billNo; // 单据编号
    @ApiModelProperty("提前领取发票原件原因")
    private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;

    @ApiModelProperty(value = "节点状态")
    private String nodeState;
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@ -1363,6 +1363,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
            //欠款金额合计
            BigDecimal qkMoneyTotal = qkMoneyOne.multiply(new BigDecimal(finBillVehicles.size()));
            finBillApplication.setArrearsMoney(qkMoneyTotal.toString());
+            //单台开票金额
+            BigDecimal oneBillMoney = finBillApplication.getOneBillMoney();
+            //计算开票金额合计
+            BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
+            finBillApplication.setTotalBillMoney(totalBillMoney);
            save(finBillApplication);
            //主车开票信息
            for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
@ -1543,6 +1548,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
            finBillApplication.setBillStateKey("004");
            finBillApplication.setBillStateValue("欠款领票");
            finBillApplication.setNum(finBillVehicles.size());
+            //单台开票金额
+            BigDecimal oneBillMoney = finBillApplication.getOneBillMoney();
+            //计算开票金额合计
+            BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
+            finBillApplication.setTotalBillMoney(totalBillMoney);
            save(finBillApplication);
            //主车开票信息
            for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
@ -2215,6 +2225,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
    public ResultBean companyToDivisionOperateQK(BusinessVariables bv) {
        ResultBean rb = ResultBean.fireFail();
        FinBillApplication finBillApplication = fetchBySid(bv.getBusinessSid());
+        if (finBillApplication.getIsLQOrigInvoice().equals("否")){
+            ResultBean resultBean = completeQK(bv);
+            return resultBean;
+        }
        bv.setOrgSidPath(finBillApplication.getOrgSidPath());
        //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
        bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@ -1954,10 +1954,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                            //外部金融：成交价 = 订金+车款+厂家贴息-服务费
                                            leftAll = leftAll.add(singleFinalPrice);
                                            if (StringUtils.isNotBlank(solutionsDetailsVo.getFactoryDiscount())) {
-                                                leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
+                                                leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount()));
                                            }
                                            if (StringUtils.isNotBlank(solutionsDetailsVo.getServiceAmount())) {
-                                                leftAll = leftAll.subtract(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
+                                                leftAll = leftAll.add(new BigDecimal(solutionsDetailsVo.getServiceAmount()));
                                            }
                                            rightAll = rightAll.add(bigDecimalVinAll);
                                        } else {
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java
@ -85,4 +85,9 @@ public class AdvanceInvoiceDto implements Dto {
    private String modelName; // 车型名称
    @ApiModelProperty("提前领取发票原件原因")
    private String reason;
+
+    @ApiModelProperty("开票总金额")
+    private String invoiceMoneyTotal;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 }
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java
@ -38,12 +38,14 @@ public class AdvanceInvoiceInfoVo implements Vo {
    private String openTickSid;
    @ApiModelProperty("默认开票名称")
    private String openTickName;
-    @ApiModelProperty("单台开票价")
-    private String invoiceMoney;
    @ApiModelProperty("选择车辆列表")
    private List<AppCarListVo> vinList  = new ArrayList<>();
+    @ApiModelProperty("单台开票价")
+    private String invoiceMoney;
    @ApiModelProperty("欠款总金额")
    private String invoiceTotal;
+    @ApiModelProperty("开票总金额")
+    private String invoiceMoneyTotal;
    @ApiModelProperty("回款日期")
    private String collectionDate;
    @ApiModelProperty("欠款原因key")
@ -88,4 +90,6 @@ public class AdvanceInvoiceInfoVo implements Vo {
    private String modelName;
    @ApiModelProperty("提前领取发票原件原因")
    private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 }
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java
@ -38,7 +38,9 @@ public class DisBaseInfoDto implements Dto {
    private String managementDetailAddress;

    @ApiModelProperty(value = "实际经营地址code")
-    private String managementDetailAddressCode;
+//    private String managementDetailAddressCode;
+    @JsonProperty("managementDetailAddressCode")
+    private String managementAddressCode;

    @ApiModelProperty(value = "实际经营地址省")
    private String managementDetailAddressProvince;
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
@ -325,6 +325,7 @@ public class AppBusAdvanceGinvoiceapplyService {
        vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
        vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
        vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
+        vo.setInvoiceMoneyTotal(finBillApplicationDetailsVo.getTotalBillMoney());
        vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
        vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
        vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
@ -340,6 +341,16 @@ public class AppBusAdvanceGinvoiceapplyService {
        vo.setModelSid(finBillApplicationDetailsVo.getModelSid());
        vo.setModelName(finBillApplicationDetailsVo.getModelName());
        vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName());
+        String reasonValue = vo.getReasonValue();
+        String remarks = vo.getRemarks();
+        String reasonRemarks = "";
+        if (StringUtils.isNotBlank(remarks)){
+            reasonRemarks = reasonValue + " \n" + remarks;
+        }else {
+            reasonRemarks = reasonValue;
+        }
+        vo.setReasonRemarks(reasonRemarks);
+        vo.setReason(finBillApplicationDetailsVo.getReason());
        //车辆信息
        List<AppCarListVo> vinListVos = new ArrayList<>();
        List<FinBillVehicleVo> finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles();
@ -498,6 +509,12 @@ public class AppBusAdvanceGinvoiceapplyService {
        FinBillApplicationDto finBillApplicationDto = new FinBillApplicationDto();
        BeanUtil.copyProperties(dto, finBillApplicationDto);
        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+        if (StringUtils.isBlank(dto.getQkkpBillNo())){
+            finBillApplicationDto.setQkkpBillNo(dto.getBillNo());
+        }else {
+            finBillApplicationDto.setQkkpBillNo(dto.getQkkpBillNo());
+        }
+        finBillApplicationDto.setTotalBillMoney(dto.getInvoiceMoneyTotal());
        finBillApplicationDto.setUseOrgSid(useOrgSid);
        finBillApplicationDto.setCreateBySid(dto.getUserSid());
        finBillApplicationDto.setArrearsMoney(dto.getInvoiceTotal());