Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractVo.java

@@ -80,4 +80,9 @@ public class CommonContractVo implements Vo {
     private String procDefId;
     @ApiModelProperty("流程实例id")
     private String procInstId;
+
+    @ApiModelProperty(value = "销售类型key")
+    private String saleTypeKey;
+    @ApiModelProperty(value = "销售类型value")
+    private String saleTypeValue;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1420,6 +1420,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleOutApply.setCustomerNo(baseVehicleZSOutApplyDto.getCustomerNo());
         //baseVehicleOutApply.setCwCustomerNo(bdCustomer.getFNumber());
         baseVehicleOutApply.setBusSid(baseVehicleZSOutApplyDto.getBusSid());
+        baseVehicleOutApply.setIsTerminal(baseVehicleZSOutApplyDto.getBuyerTypeValue());
         //保存车辆出库单主表
         baseVehicleOutApplyService.save(baseVehicleOutApply);
         //出库类型是否为全款车（001全款车）

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyMapper.xml

@@ -16,7 +16,7 @@
         bvo.`price`,
         bvoa.`orgName`,
         bvoa.`staffName`,
-        bvoa.`contractNo`,
+        bvoa.`contractNo` AS concatNo,
         CASE
         bvoa.isTerminal
         WHEN 1
@@ -34,13 +34,19 @@
         bvo.middleTwo,
         bvo.rebateMoneyOne,
         bvo.rebateMoneyTwo,
-        bvoa.innerName
+        bvoa.innerName,
+        bv.modelName,
+        bv.modelSid,
+        bv.modelConfigSid,
+        bvc.sid AS vehModelConfigSid
         FROM
         base_vehicle_out_apply bvoa
         LEFT JOIN base_vehicle_out bvo
         ON bvoa.`sid` = bvo.`mainSid`
         LEFT JOIN base_vehicle bv
         ON bv.sid = bvo.vinSid
+        LEFT JOIN base_vehmodel_config bvc ON bv.modelSid = bvc.modelSid AND bv.modelConfigSid =
+        bvc.configurationItemsSid AND bv.createOrgSid = bvc.useOrgSid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -27,6 +27,7 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
@@ -2650,6 +2651,9 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd");
             createDate = DateUtil.formatDate(dateTime);
             record.setCreateDate(createDate);
+            BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
+            record.setSaleTypeKey(busSalesOrder.getPayTypeKey());
+            record.setSaleTypeValue(busSalesOrder.getPayType());
         }
         PagerVo<CommonContractVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);

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

@@ -536,6 +536,10 @@ export default {
     // 修改、编辑、详情返回列表页面
     resetState() {
       this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
     }
   }
 }

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

@@ -224,7 +224,6 @@ export default {
       index: 0,
       moneyEdit: false,
       openTick_list: [],
-      saleType_list: [],
       arrearsOpenYY_list: [],
       image_list1: [],
       image_list2: [],
@@ -290,11 +289,6 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'purchaseType' }).then((res) => {
-        if (res.success) {
-          this.saleType_list = res.data
-        }
-      })
       typeValues({ type: 'qkCause' }).then((res) => {
         if (res.success) {
           this.arrearsOpenYY_list = res.data
@@ -424,10 +418,6 @@ export default {
         }
       }
     },
-    changeSaleType(val) {
-      const choose = this.saleType_list.filter((item) => item.dictValue === val)
-      this.formobj.saleTypeKey = choose[0].dictKey
-    },
     changeOpenTickName(val, row) {
       const choose = this.openTick_list.filter((item) => item.name === val)
       row.openTickSid = choose[0].sid

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

@@ -389,6 +389,10 @@ export default {
     // 修改、编辑、详情返回列表页面
     resetState() {
       this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
     }
   }
 }

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

@@ -370,6 +370,10 @@ export default {
     // 修改、编辑、详情返回列表页面
     resetState() {
       this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
     }
   }
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@@ -40,11 +40,7 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>销售类型</div>
-              <el-form-item prop="saleTypeValue">
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-                <el-select v-model="formobj.saleTypeValue" placeholder="请选择" @change="changeSaleType" clearable class="addinputInfo">
-                  <el-option v-for="item in saleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -226,7 +222,6 @@ export default {
       index: 0,
       moneyEdit: false,
       openTick_list: [],
-      saleType_list: [],
       arrearsOpenYY_list: [],
       image_list1: [],
       image_list2: [],
@@ -284,7 +279,6 @@ export default {
       },
       rules: {
         oneBillMoney: [{ required: true, message: '单台开票金额不能为空', trigger: 'blur' }],
-        saleTypeValue: [{ required: true, message: '销售类型不能为空', trigger: 'change' }],
         isLQOrigInvoice: [{ required: true, message: '是否领取发票原件请选择是或否', trigger: 'change' }],
         arrearsOpenYYValue: [{ required: true, message: '欠款开票原因不能为空', trigger: 'change' }]
       }
@@ -309,11 +303,6 @@ export default {
   },
   methods: {
     init() {
-      typeValues({ type: 'purchaseType' }).then((res) => {
-        if (res.success) {
-          this.saleType_list = res.data
-        }
-      })
       typeValues({ type: 'qkCause' }).then((res) => {
         if (res.success) {
           this.arrearsOpenYY_list = res.data
@@ -397,10 +386,6 @@ export default {
         }
       }
     },
-    changeSaleType(val) {
-      const choose = this.saleType_list.filter((item) => item.dictValue === val)
-      this.formobj.saleTypeKey = choose[0].dictKey
-    },
     changeOpenTickName(val, row) {
       const choose = this.openTick_list.filter((item) => item.name === val)
       row.openTickSid = choose[0].sid

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

@@ -452,6 +452,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 FinBillVehicleVo finBillVehicleVo = finBillVehicleService.fetchByMainSid(sid).get(0);
                 finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks());
                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData();
+                finBillTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice());
                 List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
                 List<String> hgzImageUrls = new ArrayList<>();
                 for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
@@ -613,6 +614,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
                     finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
                     finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                    finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
                     finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                 }
                 if (finBillTrailerVos != null) {
@@ -644,6 +646,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
                         finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
                         finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                        finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
                         finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                     }
                 }
@@ -1823,6 +1826,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
                     finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
                     finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                    finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
                     finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                 }
                 if (finBillTrailerVos != null) {
@@ -1854,6 +1858,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
                         finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
                         finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                        finVehicleInvoiceDto.setTaxpayerNo(baseDistributorListVo.getRegistNum());
                         finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                     }
                 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -37,15 +38,15 @@ public class qkkpDto implements Dto {
     private String taskDefKey;
 
     @ApiModelProperty("附件")
-    private List<String> fjApplicationAppendxs;
+    private List<String> fjApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("证件")
-    private List<String> idCardImages;
+    private List<String> idCardImages = new ArrayList<>();
     @ApiModelProperty("客户开票申请书")
-    private List<String> customerInvoiceApplyImages;
+    private List<String> customerInvoiceApplyImages = new ArrayList<>();
     @ApiModelProperty("车辆登记合同")
-    private List<String> registerContractImages;
+    private List<String> registerContractImages = new ArrayList<>();
     @ApiModelProperty("确认书")
-    private List<String> invoiceApplyConfirmImages;
+    private List<String> invoiceApplyConfirmImages = new ArrayList<>();
 
     private String orgPath;
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -1162,6 +1162,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
         BeanUtil.copyProperties(dto, finBillCompleteDto);
+        finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         ResultBean resultBean = finBillApplicationFeign.completeQKLP(finBillCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -1189,7 +1190,12 @@ public class AppBusAdvanceGinvoiceapplyService {
             orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
-        BeanUtil.copyProperties(dto, finBillCompleteDto);
+        finBillCompleteDto.setComment(dto.getComment());
+        finBillCompleteDto.setBusinessSid(dto.getBusinessSid());
+        finBillCompleteDto.setInstanceId(dto.getInstanceId());
+        finBillCompleteDto.setTaskId(dto.getTaskId());
+        finBillCompleteDto.setUserSid(dto.getUserSid());
+        finBillCompleteDto.setTaskDefKey(dto.getTaskDefKey());
         //附件信息
         List<String> fjApplicationAppendxs = dto.getFjApplicationAppendxs();//附件
         List<FinBillFileDto> fj = new ArrayList<>();//附件