Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@@ -30,11 +30,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
+import com.yxt.anrui.base.api.basevehinstall.BaseVehinstall;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageQuery;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyPageVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApply;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -126,4 +129,10 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
     int selByVinSidAndYBJ(String vinSid);
 
     String selCustomerByBusVinSid(@Param("busVinSid") String busVinSid);
+
+    List<BaseTrailer> selectTralier(String vinSid);
+
+    BusSalesOrderVehicle selectVinNoByVehicleSid(@Param("vinSid") String vinSid, @Param("contractNo") String contractId);
+
+    List<BaseVehinstall> selectInstall(String linkNo);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml

@@ -218,4 +218,19 @@
         ORDER BY a.createTime DESC
             LIMIT 1
     </select>
+
+    <select id="selectTralier" resultType="com.yxt.anrui.base.api.basetrailer.BaseTrailer">
+        select * from anrui_base.base_trailer where vehSid = #{vinSid}
+    </select>
+
+    <select id="selectVinNoByVehicleSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select bv.* from bus_sales_order_vehicle bv
+        left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where bo.contractNo  = #{contractNo} and bv.linkSid = #{vinSid}
+    </select>
+
+    <select id="selectInstall" resultType="com.yxt.anrui.base.api.basevehinstall.BaseVehinstall">
+        select * from anrui_base.base_vehinstall where vinNo = #{linkNo}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -33,10 +33,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanFeign;
-import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
-import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
-import com.yxt.anrui.base.api.basetrailer.TrailerVo;
-import com.yxt.anrui.base.api.basetrailer.TraliveredVo;
+import com.yxt.anrui.base.api.basetrailer.*;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
@@ -51,6 +48,7 @@ import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
 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.basevehinstall.BaseVehinstall;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.CertificState;
 import com.yxt.anrui.base.common.utils.Rule;
@@ -83,8 +81,10 @@ import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepa
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
+import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.busvalcustfiling.BusValcustFilingDto;
@@ -102,6 +102,8 @@ import com.yxt.anrui.buscenter.biz.bushandoverprepare.BusHandoverPrepareService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
 import com.yxt.anrui.buscenter.biz.bussalesorderloancontract.BusSalesOrderLoancontractService;
+import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
+import com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.buscenter.biz.busvalcustfiling.BusValcustFilingService;
 import com.yxt.anrui.buscenter.biz.busvehicleinformationhandover.BusVehicleInformationHandoverService;
@@ -297,6 +299,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     @Autowired
     private ScmVehRebateFeign scmVehRebateFeign;
 
+    @Autowired
+    private BusSalesOrderTrailerService busSalesOrderTrailerService;
+    @Autowired
+    private BusSalesOrderMakeupService busSalesOrderMakeupService;
+
     /**
      * 构造出库申请的查询条件
      *
@@ -3370,7 +3377,53 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         } else {
             return rb.setMsg("请选择要出库的车辆");
         }
+        //先查询该订单下是否有挂车，如果有的话，再根据该订单及车辆查询挂车是否都已入库，若没有全部入库，则提示
+        boolean isHave = false;
+        List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
+        trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+        // 如果列表不为空，使用流式操作计算总挂车数量
+        if(!trailersLists.isEmpty()){
+            int totalTrailerCount = trailersLists.stream()
+                    .mapToInt(BusSalesOrderTrailer::getTrailerCount)  // 提取数量
+                    .sum();  // 累加所有数量
 
+            if(!carList.isEmpty()){
+                for (AppCarListVo car : carList) {
+                    //根据车辆sid 查询挂车的数量
+                    List<BaseTrailer> trList = baseMapper.selectTralier(car.getVinSid());
+                    trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                    if(totalTrailerCount != trList.size()){
+                        isHave = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if(isHave){
+            return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请");
+        }
+        boolean issHave = false;
+        List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId());
+        makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+        if(!makeUpsList.isEmpty()){
+            //查询上装入库中是否有该主车关联的上装
+            if(!carList.isEmpty()){
+                for (AppCarListVo car : carList) {
+                    //根据车辆sid和合同号查询主车车架号
+                    BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId());
+                    List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
+                    trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                    if(trList.isEmpty()){
+                        issHave = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if(issHave){
+            return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
+        }
+        //=================
         BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
         int r = submitAppBusinessData(dto, busDeliveredApply);
         if (r == 3) {
@@ -4281,7 +4334,54 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         } else {
             return rb.setMsg("请选择要出库的车辆");
         }
+        //=====================
+        //先查询该订单下是否有挂车，如果有的话，再根据该订单及车辆查询挂车是否都已入库，若没有全部入库，则提示
+        boolean isHave = false;
+        List<BusSalesOrderTrailer> trailersLists = busSalesOrderTrailerService.selectTrailerByContractNo(dto.getContractId());
+        trailersLists = trailersLists.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+        // 如果列表不为空，使用流式操作计算总挂车数量
+        if(!trailersLists.isEmpty()){
+            int totalTrailerCount = trailersLists.stream()
+                    .mapToInt(BusSalesOrderTrailer::getTrailerCount)  // 提取数量
+                    .sum();  // 累加所有数量
 
+            if(!carList.isEmpty()){
+                for (AppCarListVo car : carList) {
+                    //根据车辆sid 查询挂车的数量
+                    List<BaseTrailer> trList = baseMapper.selectTralier(car.getVinSid());
+                    trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                    if(totalTrailerCount != trList.size()){
+                        isHave = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if(isHave){
+            return rb.setMsg("挂车入库绑定车辆后才可以提交出库申请");
+        }
+        boolean issHave = false;
+        List<BusSalesOrderMakeup> makeUpsList = busSalesOrderMakeupService.selectMakeUpByContractNo(dto.getContractId());
+        makeUpsList = makeUpsList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+        if(!makeUpsList.isEmpty()){
+            //查询上装入库中是否有该主车关联的上装
+            if(!carList.isEmpty()){
+                for (AppCarListVo car : carList) {
+                    //根据车辆sid和合同号查询主车车架号
+                    BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectVinNoByVehicleSid(car.getVinSid(),dto.getContractId());
+                    List<BaseVehinstall> trList = baseMapper.selectInstall(busSalesOrderVehicle.getLinkNo());
+                    trList = trList.stream().filter(Objects::nonNull).collect(Collectors.toList());  // 去除null元素
+                    if(trList.isEmpty()){
+                        issHave = true;
+                        break;
+                    }
+                }
+            }
+        }
+        if(issHave){
+            return rb.setMsg("上装入库绑定车辆后才可以提交出库申请");
+        }
+        //=================
         BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
         int r = submitAppBusinessData2(dto, busDeliveredApply);
         if (r == 3) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -97,4 +97,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
 
     @Select("select * from bus_sales_order_makeup where salesOrderSid = #{orderSid}")
     List<BusSalesOrderMakeupDetailsVo> selectTopByOrderSid(@Param("orderSid") String orderSid);
+
+    List<BusSalesOrderMakeup> selectMakeUpByContractNo(String contractId);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -109,4 +109,11 @@
     <select id="selectBySid" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
         select * from bus_sales_order_makeup where salesOrderSid = #{sid}
     </select>
+
+    <select id="selectMakeUpByContractNo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup">
+        select bm.* from bus_sales_order_makeup bm
+        left join bus_sales_order bo on bo.sid = bm.salesOrderSid
+        where bo.contractNo = #{contractId}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -281,4 +281,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
         List<BusSalesOrderMakeupDetailsVo> busSalesOrderMakeupDetailsVoList = baseMapper.selectTopByOrderSid(orderSid);
         return rb.success().setData(busSalesOrderMakeupDetailsVoList);
     }
+
+    public List<BusSalesOrderMakeup> selectMakeUpByContractNo(String contractId) {
+        return baseMapper.selectMakeUpByContractNo(contractId);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java

@@ -68,4 +68,6 @@ public interface BusSalesOrderTrailerMapper extends BaseMapper<BusSalesOrderTrai
 
 	@Select("select * from bus_sales_order_trailer where salesOrderSid = #{salesOrderSid} and sid != #{dtoSid}")
 	BusSalesOrderTrailerDetailsVo fetchByOrderSidAndNotSidOne(@Param("salesOrderSid") String salesOrderSid,@Param("dtoSid") String dtoSid);
+
+    List<BusSalesOrderTrailer> selectTrailerByContractNo(String contractId);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.xml

@@ -3,4 +3,12 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordertrailer.BusSalesOrderTrailerMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectTrailerByContractNo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer">
+        select bt.*
+        from bus_sales_order_trailer bt
+                 left join bus_sales_order bo on bo.sid = bt.salesOrderSid
+        where bo.contractNo = #{contractId}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java

@@ -183,4 +183,8 @@ public class BusSalesOrderTrailerService extends MybatisBaseService<BusSalesOrde
 		}
 		return busSalesOrderTrailerDetailsVos;
 	}
+
+	public List<BusSalesOrderTrailer> selectTrailerByContractNo(String contractId) {
+		return baseMapper.selectTrailerByContractNo(contractId);
+	}
 }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/relation/vehcile.vue

@@ -64,6 +64,9 @@
               <el-form-item label="采购订单编号:" class="searchlist">
                 <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
+              <el-form-item label="车架号:" class="searchlist">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
               <el-form-item label="快捷检索:" class="searchlist">
                 <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
@@ -171,6 +174,7 @@ export default {
           userSid: '',
           orgSid: '',
           orderingNo: '',
+          vinNo: '',
           isSales: '',
           isSettle: '',
           vinSidList: []
@@ -293,6 +297,7 @@ export default {
       this.listQuery.params.vehicleVersion = ''
       this.listQuery.params.userSid = ''
       this.listQuery.params.orderingNo = ''
+      this.listQuery.params.vinNo = ''
       this.getList()
     },
     handleSelectionChange(row) {

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue

@@ -373,7 +373,7 @@ export default {
     handleConfirm() {
       this.visibleDisabled = true
       if (this.printSource === '02') {
-        createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
+        createPdfRsk({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
           if (resp.success && resp.data.pdfPath !== '') {
             var xhr = new XMLHttpRequest()
             xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '收款单', true)
@@ -441,7 +441,7 @@ export default {
           this.visibleDisabled = false
         })
       } else if (this.printSource === '' || this.printSource === null) {
-        createPdfRsk({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
+        createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
           if (resp.success && resp.data.pdfPath !== '') {
             var xhr = new XMLHttpRequest()
             xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '收款单', true)

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/relation/vehcile.vue

@@ -64,6 +64,9 @@
               <el-form-item label="采购订单编号:" class="searchlist">
                 <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
+              <el-form-item label="车架号:" class="searchlist">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable style="width: 150px"/>
+              </el-form-item>
               <el-form-item label="快捷检索:" class="searchlist">
                 <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
               </el-form-item>
@@ -171,6 +174,7 @@ export default {
           userSid: '',
           orgSid: '',
           orderingNo: '',
+          vinNo: '',
           isSales: '',
           isSettle: '',
           vinSidList: []
@@ -293,6 +297,7 @@ export default {
       this.listQuery.params.vehicleVersion = ''
       this.listQuery.params.userSid = ''
       this.listQuery.params.orderingNo = ''
+      this.listQuery.params.vinNo = ''
       this.getList()
     },
     handleSelectionChange(row) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFallback.java

@@ -1,9 +1,7 @@
 package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
 
 
-import com.yxt.anrui.riskcenter.api.loanbuckleapply.app.AppBuckleDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
-import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.TransferDelegateQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -51,6 +49,11 @@ public class LoanMonthlyAccrualApplyFallback implements LoanMonthlyAccrualApplyF
         return null;
     }
 
+    @Override
+    public ResultBean rePushVoucher(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitAccrualDto dto) {
         return null;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyFeign.java

@@ -1,7 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply;
 
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
-import com.yxt.anrui.riskcenter.api.loantransferpaymentapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -63,6 +62,10 @@ public interface LoanMonthlyAccrualApplyFeign {
     @PostMapping("/accrualCreatePdf")
     public ResultBean<String> accrualCreatePdf(@RequestParam("sid") String sid);
 
+    @ApiOperation("重推凭证")
+    @PostMapping("/rePushVoucher")
+    public ResultBean rePushVoucher(@RequestParam("sid") String sid);
+
     //---------------------------流程---------------------------------------
 
     @ApiOperation("提交")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyRest.java

@@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loanmonthlyaccrualapply;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
-import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDayExportVo;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.*;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.flow.*;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -78,6 +77,13 @@ public class LoanMonthlyAccrualApplyRest implements LoanMonthlyAccrualApplyFeign
         return loanMonthlyAccrualApplyService.accrualCreatePdf(sid);
     }
 
+    @Override
+    public ResultBean rePushVoucher(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        loanMonthlyAccrualApplyService.rePushVoucher(sid);
+        return rb.success();
+    }
+
     @Override
     public ResultBean submitRecordApplication(SubmitAccrualDto dto) {
         return loanMonthlyAccrualApplyService.submitRecordApplication(dto);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java

@@ -7,19 +7,15 @@ 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.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
-import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
-import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -54,13 +50,15 @@ import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
-import com.yxt.common.base.utils.DateUtils;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.base.utils.WordConvertUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.messagecenter.api.message.*;
+import com.yxt.messagecenter.api.message.Message;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import com.yxt.messagecenter.api.messagelist.MessageList;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import org.apache.commons.lang3.StringUtils;
@@ -70,7 +68,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.io.InputStream;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -1202,4 +1199,8 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
         }
         return recordList;
     }
+
+    public void rePushVoucher(String sid) {
+        pushAccrualVoucher(sid);
+    }
 }

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue

@@ -132,7 +132,6 @@ export default {
   data() {
     return {
       useOrg: '',
-      buyerOrgSid: '',
       carBrand_list: [],
       vehicleType_list: [],
       productLine_list: [],
@@ -166,7 +165,7 @@ export default {
           vehicleType: '',
           vehicleVersion: '',
           userSid: '',
-          buyerOrgSid: '',
+          orgSid: '',
           vinNo: '',
           salesDateStart: '',
           salesDateEnd: '',
@@ -262,7 +261,7 @@ export default {
     getList() {
       this.listLoading = true
       this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
-      this.listQuery.params.buyerOrgSid = this.buyerOrgSid
+      this.listQuery.params.orgSid = window.sessionStorage.getItem('defaultOrgPath')
       req.pageList(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
@@ -294,6 +293,7 @@ export default {
           vehicleType: '',
           vehicleVersion: '',
           userSid: '',
+          orgSid: '',
           vinNo: '',
           salesDateStart: '',
           salesDateEnd: '',
@@ -325,7 +325,7 @@ export default {
       })
       this.sids = aa
     },
-    showData(value, buyerOrgSid) {
+    showData(value) {
       const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
@@ -335,7 +335,6 @@ export default {
       } else {
         this.listQuery.params.vinNoList = []
       }
-      this.buyerOrgSid = buyerOrgSid
       this.init()
     },
     // 添加修改返回

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaform/OaForm.java

@@ -1,9 +1,12 @@
 package com.yxt.anrui.oa.biz.oaform;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -23,8 +26,9 @@ public class OaForm extends BaseEntity {
     private String deptSid;
     @ApiModelProperty("部门名称")
     private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结日期")
-    private String finishTime;
+    private Date finishTime;
     @ApiModelProperty("实例id")
     private String procInstId;
     @ApiModelProperty("流程定义id")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oahireapply/OaHireApply.java

@@ -52,7 +52,7 @@ import lombok.Data;
 @TableName("oa_hire_apply")
 public class OaHireApply extends OaForm {
     private static final long serialVersionUID = 1L;
-
+    private String formSid;
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("申请人")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oaleaveapply/OaLeaveApply.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.oaleaveapply;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.anrui.oa.biz.oaform.OaForm;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
@@ -49,9 +50,9 @@ import lombok.Data;
 @Data
 @ApiModel(value = "请假申请", description = "请假申请")
 @TableName("oa_leave_apply")
-public class OaLeaveApply extends BaseEntity {
+public class OaLeaveApply extends OaForm {
     private static final long serialVersionUID = 1L;
-
+    private String formSid;
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("申请人")

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/oamendapply/OaMendApply.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.oa.biz.oamendapply;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.anrui.oa.biz.oaform.OaForm;
 import com.yxt.common.core.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
@@ -49,9 +50,9 @@ import lombok.Data;
 @Data
 @ApiModel(value = "补卡申请", description = "补卡申请")
 @TableName("oa_mend_apply")
-public class OaMendApply extends BaseEntity {
+public class OaMendApply extends OaForm {
     private static final long serialVersionUID = 1L;
-
+    private String formSid;
 	@ApiModelProperty("单据编号")
     private String billNo; // 单据编号
 	@ApiModelProperty("申请人")