Merge remote-tracking branch 'origin/master'

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

@@ -1784,6 +1784,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 if (vehicleDetailsVos.size() > 0) {
                     for (BusArrearsCarryVehicleDetailsVo vehicleDetailsVo : vehicleDetailsVos) {
                         BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
+                        busDeliveredDto.setCreateBySid(busArrearsCarryVehicleApply.getCreateBySid());
                         busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode());
                         busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks());
                         busDeliveredDto.setPaymentMethodKey(busArrearsCarryVehicleApply.getPaymentMethodKey());

anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue

@@ -214,7 +214,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>其他附件</div>
+            <div>其他附件(含资方信审图片)</div>
           </div>
           <el-row>
             <el-col :span="24">

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue

@@ -171,7 +171,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>其他附件</div>
+            <div>其他附件(含资方信审图片)</div>
           </div>
           <el-row>
             <el-col :span="24">

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue

@@ -213,7 +213,7 @@
             </el-col>
           </el-row>
           <div class="title">
-            <div>其他附件</div>
+            <div>其他附件(含资方信审图片)</div>
           </div>
           <el-row>
             <el-col :span="24">

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

@@ -389,7 +389,10 @@ export default {
       const bb = []
       row.forEach(element => {
         aa.push(element.sid)
-        bb.push(element.nodeState)
+        bb.push({
+          nodeState: element.nodeState,
+          isLQOrigInvoice: element.isLQOrigInvoice
+        })
       })
       this.sids = aa
       this.nodeState_list = bb
@@ -474,11 +477,11 @@ export default {
     },
     toArrear() {
       if (this.sids.length === 1) {
-        if (this.nodeState_list[0] === '已办结') {
+        if (this.nodeState_list[0].nodeState === '已办结' && this.nodeState_list[0].isLQOrigInvoice === '是') {
           this.viewState = 5
           this.$refs['divArrearScollection'].showAdd(this.sids[0])
         } else {
-          this.$message({ showClose: true, type: 'error', message: '请选择状态为已办结的进行欠款领票操作' })
+          this.$message({ showClose: true, type: 'error', message: '请选择状态为已办结且是否领取发票原件为否的进行欠款领票操作' })
           return
         }
       } else {

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

@@ -446,11 +446,18 @@ export default {
     doHandover() {
       if (this.sids.length === 1) {
         if (this.nodeState_list[0].billingState === '已开票' && this.nodeState_list[0].transferState === '未移交') {
+          var nowDate = new Date()
+          var date = {
+            year: nowDate.getFullYear(),
+            month: nowDate.getMonth() + 1,
+            day: nowDate.getDate()
+          }
+          var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
           this.formobj = {
             recipient: '',
             recipientSid: '',
             showTransfer: true,
-            transferTime: '',
+            transferTime: dayDate,
             sid: ''
           }
           this.dialogFileVisible = true

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/InvoicingVo.java

@@ -2,18 +2,22 @@ package com.yxt.anrui.fin.api.fincompanyinvoicing;
 
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @description: 开票信息
  * @author: dimengzhe
  * @date: 2023/5/19
  **/
+@Data
 public class InvoicingVo implements Vo {
     private static final long serialVersionUID = 1044076091993510821L;
 
-    @ApiModelProperty("名称")
-    private String name;
     @ApiModelProperty("开票信息sid")
     private String sid;
 
+    private String dictKey;
+
+    private String dictValue;
+
 }

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

@@ -1305,10 +1305,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         arReceivebill.setF_PAEZ_AssistantKey("002");
                     }
                     arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
-                    if (customerList.size() == 1 && finSelectedReceivablesDetailedVos2.size() == 0) {
+                    if (customerList.size() == 1 && finSelectedReceivablesDetailedVos2.size() == 0
+                    && finSelectedReceivablesDetailedVos1_1_1.size() == 0
+                    && finSelectedReceivablesDetailedVos1_1.size() == 0
+                    && finSelectedReceivablesDetailedVos2_1.size() == 0
+                    && finSelectedReceivablesDetailedVos1_1_2.size() == 0) {
                         arReceivebill.setFBillNo(confirmation.getBillNo());
                     } else {
-                        carSize = i + 1;
+                        carSize = carSize + 1;
                         arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                     }
                     ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
@@ -1351,9 +1355,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         }
                         arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
                         if (finSelectedReceivablesDetailedVos1.size() > 1) {
-                            int size = 0;
-                            size = i + 1;
-                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size);
+                            carSize = carSize + 1;
+                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                         } else {
                             arReceivebill.setFBillNo(confirmation.getBillNo());
                         }
@@ -1440,7 +1443,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if (customerList.size() == 1 && finSelectedReceivablesDetailedVos2.size() == 0 && finSelectedReceivablesDetailedVos1.size() == 0) {
                         arReceivebill.setFBillNo(confirmation.getBillNo());
                     } else {
-                        carSize = i + 1;
+                        carSize = carSize + 1;
                         arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                     }
                     ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
@@ -1483,9 +1486,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         }
                         arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
                         if (finSelectedReceivablesDetailedVos1_1_1.size() > 1) {
-                            int size = 0;
-                            size = i + 1;
-                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size);
+                            carSize = carSize + 1;
+                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                         } else {
                             arReceivebill.setFBillNo(confirmation.getBillNo());
                         }
@@ -1604,9 +1606,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
                         arReceivebill.setF_PAEZ_AssistantKey("006");
                         if (finSelectedReceivablesDetailedVos2.size() > 1) {
-                            int size = 0;
-                            size = i + 1;
-                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + size);
+                            carSize = carSize + 1;
+                            arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
                         } else {
                             arReceivebill.setFBillNo(confirmation.getBillNo());
                         }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.xml

@@ -19,6 +19,6 @@
     </select>
 
 	<select id="selectInvoingList" resultType="com.yxt.anrui.fin.api.fincompanyinvoicing.InvoicingVo">
-		select name,sid from fin_company_invoicing where useOrgSid = #{useOrgSid}
+		select name dictValue,sid,sid as dictKey from fin_company_invoicing where useOrgSid = #{useOrgSid}
 	</select>
 </mapper>

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

@@ -142,15 +142,21 @@
     <select id="selectByContractNoOne" resultType="java.lang.String">
         select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
+        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.contractNo = #{contractNo}
-          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
+        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
+        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
     </select>
 
     <select id="selectByCreateBySidOne" resultType="java.lang.String">
-        select distinct fun.busVinSid
+        select fun.busVinSid
         from fin_uncollected_receivables_detailed fun
+        left join fin_uncollected_receivables_detailed fun1 on fun.busVinSid = fun1.busVinSid
         where fun.createBySid = #{userSid}
-          and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0)
+        and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney = 0 )
+        and fun.receivablesName='订金' and (fun1.currentReceivableMoney &lt; 0 or fun1.currentReceivableMoney = 0 )
+        and (fun1.receivablesName='首付款及费用' or fun1.receivablesName = '车款')
     </select>
     <select id="selectSidBybusVinSidAndConNo" resultType="java.lang.String">
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -342,7 +342,7 @@ public class AppBusArrearsCarryVehicleApplyService {
             if ("Activity_0ynxtyz".equals(query.getTaskDefKey())) {
                 //销售经理信审截图
                 arrearVo = new ArrearVo();
-                arrearVo.setTitle("其他附件");
+                arrearVo.setTitle("其他附件（含资方信审照片）");
                 arrearVo.setType(1);
                 arrearVo.setKey("fileList");
                 arrearVo.setNullAble(false);