Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java

@@ -48,6 +48,9 @@ import io.swagger.annotations.ApiModelProperty;
 public class BaseManufactorSubscription extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("作废说明")
+    private String cancalRemarks;
+
     @ApiModelProperty("采购类型key")
     private String applyTypeKey;
     @ApiModelProperty("采购类型value")
@@ -84,6 +87,14 @@ public class BaseManufactorSubscription extends BaseEntity {
     @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
 
+    public String getCancalRemarks() {
+        return cancalRemarks;
+    }
+
+    public void setCancalRemarks(String cancalRemarks) {
+        this.cancalRemarks = cancalRemarks;
+    }
+
     /**
      * @return 打款状态
      */

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeign.java

@@ -84,5 +84,5 @@ public interface BaseManufactorSubscriptionFeign {
 
     @ApiOperation("作废")
     @PostMapping("/cancel")
-    ResultBean cancel(@RequestParam("sid") String sid);
+    ResultBean cancel(@RequestParam("sid") String sid,@RequestParam("cancalRemarks")String cancalRemarks);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionFeignFallback.java

@@ -95,7 +95,7 @@ public class BaseManufactorSubscriptionFeignFallback implements BaseManufactorSu
     }
 
     @Override
-    public ResultBean cancel(String sid) {
+    public ResultBean cancel(String sid,String cancalRemarks) {
         return null;
     }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApply.java

@@ -76,6 +76,10 @@ public class BaseTrailerOutApply extends BaseEntity {
     private String gcVinNo; // 挂车车架号
 	@ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票")
     private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
 	@ApiModelProperty("开票单位")
     private String invoiceTitle; // 开票单位
 	@ApiModelProperty("开票类型key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDetailsVo.java

@@ -83,6 +83,10 @@ public class BaseTrailerOutApplyDetailsVo implements Vo {
     private String gcVinNo; // 挂车车架号
 	@ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票")
     private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
 	@ApiModelProperty("开票单位")
     private String invoiceTitle; // 开票单位
 	@ApiModelProperty("开票类型key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetraileroutapply/BaseTrailerOutApplyDto.java

@@ -81,6 +81,10 @@ public class BaseTrailerOutApplyDto implements Dto {
     private String gcVinNo; // 挂车车架号
 	@ApiModelProperty("业务状态 001正常开票 002包牌开票 003欠款开票")
     private String businessState; // 业务状态 001正常开票 002包牌开票 003欠款开票
+    @ApiModelProperty(value = "开票名称sid")
+    private String openTickSid;
+    @ApiModelProperty(value = "开票名称")
+    private String openTickName;
 	@ApiModelProperty("开票单位")
     private String invoiceTitle; // 开票单位
 	@ApiModelProperty("开票类型key")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java

@@ -79,4 +79,7 @@ public class BaseDiscountpackageGetVehQuery implements Query {
     private String solidStartDate;
     @ApiModelProperty(value = "买断结束日期")
     private String solidEndDate;
+
+    @ApiModelProperty(value = "车架号")
+    private String vinNo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrder.java

@@ -124,4 +124,6 @@ public class BusVehicleOrder extends BaseEntity {
     private String subscriptionDate;
 
     private String lockingNum;
+
+    private String cancalRemarks;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java

@@ -142,6 +142,6 @@ public interface BusVehicleOrderFeign {
     @ApiOperation("作废采购订单")
     @PostMapping("/cancal")
     @ResponseBody
-    ResultBean cancal(@RequestParam("sid")String sid);
+    ResultBean cancal(@RequestParam("sid")String sid,@RequestParam("cancalRemarks")String cancalRemarks);
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java

@@ -135,7 +135,7 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
     }
 
     @Override
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
         return null;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionRest.java

@@ -147,7 +147,7 @@ public class BaseManufactorSubscriptionRest implements BaseManufactorSubscriptio
     }
 
     @Override
-    public ResultBean cancel(String sid) {
+    public ResultBean cancel(String sid,String cancalRemarks) {
-        return baseManufactorSubscriptionService.cancel(sid);
+        return baseManufactorSubscriptionService.cancel(sid,cancalRemarks);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -334,7 +334,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         return resultBean.success();
     }
 
-    public ResultBean cancel(String sid) {
+    public ResultBean cancel(String sid,String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         //验证该厂家认款是否已经通过
         BaseManufactorSubscription baseManufactorSubscription = fetchBySid(sid);
@@ -345,6 +345,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
             return rb.setMsg("该数据已通过，不允许作废");
         }
         baseManufactorSubscription.setState(2);
+        baseManufactorSubscription.setCancalRemarks(cancalRemarks);
         baseMapper.updateById(baseManufactorSubscription);
         return rb.success();
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -230,6 +230,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(modelSid);
                 vos.setCarDetailPage(appVehicleVersionVo);
                 vos.setVehicleAlias(baseVehicleModel.getModelName());
+                vos.setGuidedPrice(vos.getGuidedPrice()+"调到"+vos.getTzhGuidedPrice());
+                vos.setManufactorSettlementPrice(vos.getManufactorSettlementPrice()+"调到"+vos.getTzhManufactorSettlementPrice());
             });
         }
         baseModelModpriceDetailVo.setBaseModelModpriceModels(baseModelModpriceModelVos);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetraileroutapply/BaseTrailerOutApplyService.java

@@ -311,11 +311,14 @@ public class BaseTrailerOutApplyService extends MybatisBaseService<BaseTrailerOu
         baseTrailerOutApplyDetailsVo.setGcVinNo(baseTrailer.getVinNo());
         //业务状态
         baseTrailerOutApplyDetailsVo.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
+        //开票名称
+        baseTrailerOutApplyDetailsVo.setOpenTickSid(finBillVehicleDetailsVo.getOpenTickSid());
+        baseTrailerOutApplyDetailsVo.setOpenTickName(finBillVehicleDetailsVo.getOpenTickName());
         //开票单位
         baseTrailerOutApplyDetailsVo.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
         //开票类型
-        baseTrailerOutApplyDetailsVo.setBillTypeKey(finBillApplicationDetailsVo.getOpenTickTypeKey());
+        baseTrailerOutApplyDetailsVo.setBillTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
-        baseTrailerOutApplyDetailsVo.setBillTypeValue(finBillApplicationDetailsVo.getOpenTickTypeValue());
+        baseTrailerOutApplyDetailsVo.setBillTypeValue(finBillVehicleDetailsVo.getBillTypeValue());
         //销售合同价
         baseTrailerOutApplyDetailsVo.setOneBillMoney(baseTrailer.getDealPrice().toString());
         //开票信息

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3540,6 +3540,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(params.getVehicleAlias())) {
             qw.like("bvm.vehicleAlias", params.getVehicleAlias());
         }
+        //车架号
+        if (StringUtils.isNotBlank(params.getVinNo())) {
+            qw.like("bv.vinNo", params.getVinNo());
+        }
         //快捷检索车型
         if (StringUtils.isNotBlank(params.getModelName())) {
             qw.like("bvm.modelName", params.getModelName());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -812,6 +812,21 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         BaseVehicleActualSales baseVehicleActualSales = fetchBySid(query.getBusinessSid());
         String businessTaskId = baseVehicleActualSales.getTaskId();
         if (StringUtils.isNotBlank(businessTaskId)) {
+            if(query.getUserSid().equals(baseVehicleActualSales.getCreateBySid())){
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> paramMap = BeanUtil.beanToMap(resultBean.getData());
+                updateFlowFiled(paramMap);
+                //更新车辆状态为未买断
+                String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
+                String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
+                updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
+                return rb.success().setData(resultBean.getData());
+            }else{
                 if (businessTaskId.equals(query.getTaskId())) {
                     FlowTaskVo flowTaskVo = new FlowTaskVo();
                     BeanUtil.copyProperties(query, flowTaskVo);
@@ -828,6 +843,8 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                     return rb.success().setData(resultBean.getData());
                 }
             }
+
+        }
         return rb.setMsg("操作失败!提交的数据不一致!");
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java

@@ -228,8 +228,8 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
     }
 
     @Override
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
-        return busVehicleOrderService.cancal(sid);
+        return busVehicleOrderService.cancal(sid,cancalRemarks);
     }
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java

@@ -552,7 +552,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         return rb.success().setData(busVehicleApplySz);
     }
 
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         BusVehicleOrder busVehicleOrder = fetchBySid(sid);
         //查询采购订单是否已下线
@@ -561,6 +561,7 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         }
         busVehicleOrder.setOrderStatus("已作废");
         busVehicleOrder.setLockingNum(busVehicleOrder.getPlatformNo());
+        busVehicleOrder.setCancalRemarks(cancalRemarks);
         baseMapper.updateById(busVehicleOrder);
         return rb.success();
     }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java

@@ -158,4 +158,7 @@ public class SolutionsDetailsssVo {
     @ApiModelProperty("上装成交价")
     private String szPrice;
 
+    @ApiModelProperty("实际首付比例")
+    private String downPayAmountsRatio;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -538,6 +538,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             List<String> vinSidList  = busHandoverPrepareVehicleList.stream().map(v->v.getVinSid()).collect(Collectors.toList());
             //查询车辆的随车资料是否都已移交
             List<String> countList = busVehicleInformationHandoverService.selectByVinSid(vinSidList);
+            List<String> countList1 = busVehicleInformationHandoverService.selectByVinSid1(vinSidList);
+            countList1.removeAll(Collections.singleton(null));
+            if(countList1.size() != vinSidList.size()){
+                return rb.setMsg("车辆中包含随车资料记录为空的车辆，请检查");
+            }
             if(!countList.isEmpty()){
                 return rb.setMsg("车辆："+String.join(",",countList)+"随车资料未完成交接");
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -4973,41 +4973,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        //单台成交价与单台订金相等
-       /* if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
-            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
-            List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
-            for (int i = 0; i < vinList.size(); i++) {
-                UnCollectionDto unCollectionDto = new UnCollectionDto();
-                //合同sid
-                unCollectionDto.setContractSid(commonContract.getSid());
-                //合同编号
-                unCollectionDto.setContractNo(commonContract.getContractNo());
-                //客户名称
-                unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
-                //客户sid
-                unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
-                //客户类型
-                unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
-                //客户类型
-                unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
-                //客户头像
-                unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
-                unCollectionDto.setReceivablesName("车款");
-                unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
-                unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
-                unCollectionDto.setVinNo(vinList.get(i).getVinNo());
-                unCollectionDto.setCurrentReceivableMoney(money);
-                unCollectionDto.setUserSid(userSid);
-                unCollectionDto.setReveivableMoney(money);
-                unCollectionDto.setBusVinSid(vinList.get(i).getSid());
-                unCollectionDto.setPayType(appOrderDetailsVo.getPayType());
-                unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
-                unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName());
-                unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
-                finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
-            }
-        }*/
         //添加推送至款项确认的应收未收明细中
         List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
         //更新销售订单的临时号
@@ -5024,7 +4989,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 } else {
                     temporaryName = appOrderDetailsVo.getName() + temporaryNo;
                 }
-
                 //更新临时号
                 ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo, temporaryName);
             }
@@ -5078,6 +5042,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
                 unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName());
                 unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
+                BusSalesOrder busSalesOrder = fetchBySid(appOrderDetailsVo.getBusSalesOrderSid());
+                unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
             }
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@@ -67,7 +67,7 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
         if (pagerQuery != null) {
             if (pagerQuery.getType() == 0) {
                 qw.eq("receiveState", 0);
-                qw.isNull("receiveSid");
+                qw.isNull("receiveSid").or().eq("receiveSid","");
             } else if (pagerQuery.getType() == 1) {
                 qw.eq("receiveState", 1);
                 //接收开始时间-接收结束时间

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java

@@ -26,6 +26,7 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
     BusVehicleInformationHandover detailsByVinSid(@Param("sid")String sid);
 
     List<String> selectByVinSid(@Param("list") List<String> vinSidList);
+    List<String> selectByVinSid1(@Param("list") List<String> vinSidList);
 
     IPage<AppInformationListVo> selectAppPageVo(IPage<BusVehicleInformationHandover> page, @Param(Constants.WRAPPER)QueryWrapper<AppInformationListVo> qw);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml

@@ -57,6 +57,14 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="selectByVinSid1" resultType="java.lang.String">
+        select bh.vinNo
+        from bus_vehicle_information_handover bh where bh.vehicleSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
     <select id="selectAppPageVo"
             resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.AppInformationListVo">
         SELECT

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -574,6 +574,10 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         return baseMapper.selectByVinSid(vinSidList);
     }
 
+    public List<String> selectByVinSid1(List<String> vinSidList) {
+        return baseMapper.selectByVinSid1(vinSidList);
+    }
+
     /*********************************移动端接口************************************************/
     /**
      * 分页列表

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@@ -79,14 +79,14 @@ public class FinBillApplicationDto implements Dto {
     private String totalBillMoney;
     @ApiModelProperty("申请日期")
     private String applyDate;
-    @ApiModelProperty("流程定义的id")
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+/*    @ApiModelProperty("流程定义的id")
     private String procDefId;
     @ApiModelProperty("环节定义的sid")
     private String nodeSid;
-    @ApiModelProperty("流程状态")
-    private String nodeState;
     @ApiModelProperty("流程实例的sid")
-    private String procInstSid;
+    private String procInstSid;*/
     @ApiModelProperty(value = "是否延迟开票")
     private String isDelayBill;
     @ApiModelProperty(value = "是否高低开")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@@ -135,5 +135,7 @@ public class FinCollectionConfirmation extends BaseEntity {
     @ApiModelProperty("销售专员部门sid")
     private String staffDeptSid;
     @ApiModelProperty("下载次数")
-    private String downNum; // 下载次数
+    private String downNum;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java

@@ -124,6 +124,7 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
     private String staffDeptName;
     @ApiModelProperty("销售专员部门sid")
     private String staffDeptSid;
-
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java

@@ -131,5 +131,6 @@ public class FinCollectionConfirmationDto implements Dto {
     private String staffDeptName;
     @ApiModelProperty("销售专员部门sid")
     private String staffDeptSid;
-
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -165,4 +165,10 @@ public interface FinCollectionConfirmationFeign {
     @ApiOperation("欠款提车已选车辆的已认款")
     @GetMapping("/selectCollectionMoneys")
     ResultBean<String> selectCollectionMoneys(@RequestParam("contractId") String contractId, @RequestParam("busVinSidList") List<String> busVinSidList);
+
+    /**********************************************************************************************************/
+
+    @ApiOperation("简易订单可用订金列表 ")
+    @PostMapping("/jyddkydjListPage")
+    public ResultBean<PagerVo<FinCollectionConfirmationJYDDKYDJVo>> jyddkydjListPage(@RequestBody PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -177,4 +177,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
     public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
         return null;
     }
+
+    @Override
+    public ResultBean<PagerVo<FinCollectionConfirmationJYDDKYDJVo>> jyddkydjListPage(PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJQuery.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.fincollectionconfirmation;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fincenter(销售相关) <br/>
+ * File: FinCollectionConfirmationQuery.java <br/>
+ * Class: com.yxt.anrui.fincenter.api.fincollectionconfirmation.FinCollectionConfirmationQuery <br/>
+ * Description: 收款确认表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 查询条件", description = "收款确认表 查询条件")
+@Data
+public class FinCollectionConfirmationJYDDKYDJQuery implements Query {
+    
+	@ApiModelProperty("收款开始日期")
+    private String collectionStartDate;
+    @ApiModelProperty("收款结束日期")
+    private String collectionEndDate;
+	@ApiModelProperty("销售专员部门名称")
+    private String staffDeptName;
+	@ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("联系电话")
+    private String phone;
+    @ApiModelProperty("付款人")
+    private String payerName;
+    @ApiModelProperty("收款最小金额")
+    private String collectionSmallMoney;
+    @ApiModelProperty("收款最大金额")
+    private String collectionBigMoney;
+    private String menuUrl;
+    private String menuSid;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+    @ApiModelProperty("当前组织机构分公司sid全路径")
+    private String orgPath;
+
+
+
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationJYDDKYDJVo.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.fincollectionconfirmation;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-fin(销售相关) <br/>
+ * File: FinCollectionConfirmationVo.java <br/>
+ * Class: com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationVo <br/>
+ * Description: 收款确认表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-12 17:57:01 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "收款确认表 视图数据对象", description = "收款确认表 视图数据对象")
+@Data
+public class FinCollectionConfirmationJYDDKYDJVo implements Vo {
+
+    @ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("分公司名称")
+    private String useOrgName;
+    @ApiModelProperty("分公司sid")
+    private String useOrgSid;
+    @ApiModelProperty("销售专员部门名称")
+    private String staffDeptName;
+    @ApiModelProperty("销售专员名称")
+    private String staffName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("付款人")
+    private String payerName;
+    @ApiModelProperty("联系电话")
+    private String phone;
+    @ApiModelProperty("收款日期")
+    private String collectionDate;
+    @ApiModelProperty("收款金额")
+    private String collectionMoney;
+    @ApiModelProperty("余额")
+    private String balance;
+}

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

@@ -685,7 +685,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
+        if (StringUtils.isBlank(finBillApplication.getProcDefId())){
+            flowProcessMapQuery.setProDefKey(bv.getModelId());
+        }else {
             flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
+        }
         flowProcessMapQuery.setVariables(variables);
         flowProcessMapQuery.setContractNo(finBillApplication.getContractNo());
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
@@ -2016,7 +2020,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             bv.setTaskDefKey(finBillApplication.getNodeSid());
             bv.setComment("重新提交");
             bv.setInstanceId(dto.getInstanceId());
-            return complete(bv);
+            return completeQK(bv);
         }
         return null;
     }
@@ -2035,7 +2039,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //========================================
         finBillApplication = fetchBySid(businessSid);
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
+        if (StringUtils.isBlank(finBillApplication.getProcDefId())){
+            flowProcessMapQuery.setProDefKey(bv.getModelId());
+        }else {
             flowProcessMapQuery.setProDefKey(finBillApplication.getProcDefId());
+        }
         flowProcessMapQuery.setVariables(variables);
         flowProcessMapQuery.setContractNo(finBillApplication.getContractNo());
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();

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

@@ -120,4 +120,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     String selectCollectionMoney(String contractNo);
 
     String selectCollectionMoneys(@Param("contractNo") String contractId, @Param("list") List<String> busVinSidList);
+
+    IPage<FinCollectionConfirmationJYDDKYDJVo> jyddkydjListPage(IPage<FinCollectionConfirmation> page, @Param(Constants.WRAPPER)QueryWrapper<FinCollectionConfirmation> qw);
 }

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

@@ -168,7 +168,7 @@
     </select>
 
     <select id="selectNum" resultType="java.lang.String">
-        select RIGHT(billNo, 4)
+        select RIGHT (billNo, 4)
         from fin_collection_confirmation
         where billNo LIKE concat(#{bill}, '%')
         order by id desc
@@ -176,20 +176,45 @@
     </select>
 
     <update id="updateVin">
-        update fin_selected_receivables_detailed set VIN = #{vinNo} where contractNo = #{contractNo} and VIN = #{temporaryNo}
+        update fin_selected_receivables_detailed
+        set VIN = #{vinNo}
+        where contractNo = #{contractNo}
+          and VIN = #{temporaryNo}
     </update>
 
     <select id="selectCollectionMoney" resultType="java.lang.String">
-        select sum(subscriptionMoney) from fin_selected_receivables_detailed where
+        select sum(subscriptionMoney)
-        contractNo = #{contractNo} and auditState = 3
+        from fin_selected_receivables_detailed
-
+        where contractNo = #{contractNo}
+          and auditState = 3
     </select>
 
     <select id="selectCollectionMoneys" resultType="java.lang.String">
-        select sum(fsd.subscriptionMoney) from fin_selected_receivables_detailed  fsd left join fin_uncollected_receivables_detailed fusd on fusd.sid = fsd.receivablesSid
+        select sum(fsd.subscriptionMoney) from fin_selected_receivables_detailed fsd left join
+        fin_uncollected_receivables_detailed fusd on fusd.sid = fsd.receivablesSid
         where fsd. auditState = 3 and fusd.busVinSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
     </select>
+
+    <select id="jyddkydjListPage"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo">
+        SELECT
+        fcc.staffDeptName,
+        fcc.staffName,
+        fcc.`billNo`,
+        fcc.`payerName`,
+        bd.`draweeMobile`,
+        fcc.collectionDate,
+        fcc.collectionMoney,
+        fcc.balance
+        FROM
+        fin_collection_confirmation fcc
+        LEFT JOIN anrui_buscenter.`bus_deposit` bd
+        ON fcc.`busSid` f = bd.`billSid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -255,4 +255,11 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
     public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
         return finCollectionConfirmationService.selectCollectionMoneys(contractId,busVinSidList);
     }
+
+    @Override
+    public ResultBean<PagerVo<FinCollectionConfirmationJYDDKYDJVo>> jyddkydjListPage(PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<FinCollectionConfirmationJYDDKYDJVo> pv = finCollectionConfirmationService.jyddkydjListPage(pq);
+        return rb.success().setData(pv);
+    }
 }

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

@@ -57,6 +57,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeig
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CustomerQuery;
+import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
@@ -75,6 +76,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
@@ -372,7 +374,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return billNo;
     }
 
-    public ResultBean getMsg(FinCollectionConfirmationDto dto){
+    public ResultBean getMsg(FinCollectionConfirmationDto dto) {
         ResultBean rb = ResultBean.fireFail();
         //订金不允许多收
         List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
@@ -380,12 +382,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 .filter((FinSelectedReceivablesDetailedDto b) -> "订金".equals(b.getReceivablesName()))
                 .collect(Collectors.toList());
         dingList.removeAll(Collections.singleton(null));
-        if(!dingList.isEmpty()){
+        if (!dingList.isEmpty()) {
-            for (int i = 0; i <dingList.size(); i++) {
+            for (int i = 0; i < dingList.size(); i++) {
                 FinSelectedReceivablesDetailedDto finSelectedReceivablesDetailedDto = dingList.get(i);
                 BigDecimal currentReceivableMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getCurrentReceivableMoney());
                 BigDecimal subscriptionMoney = new BigDecimal(finSelectedReceivablesDetailedDto.getSubscriptionMoney());
-                if(subscriptionMoney.compareTo(currentReceivableMoney)>0){
+                if (subscriptionMoney.compareTo(currentReceivableMoney) > 0) {
                     return rb.setMsg("订金不允许多收，请检查");
                 }
 
@@ -398,7 +400,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
         ResultBean resultBean = getMsg(dto);
-        if(!resultBean.getSuccess()){
+        if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
         if (StringUtils.isBlank(sid)) {
@@ -417,11 +419,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                 }
             }
-            List<String> stringList = finSelectedReceivablesDetailedDtos.stream().map(v->v.getReceivablesSid()).collect(Collectors.toList());
+            List<String> stringList = finSelectedReceivablesDetailedDtos.stream().map(v -> v.getReceivablesSid()).collect(Collectors.toList());
             stringList.removeAll(Collections.singleton(null));
-            if(!stringList.isEmpty()){
+            if (!stringList.isEmpty()) {
                 List<String> stringList1 = stringList.stream().distinct().collect(Collectors.toList());
-                if(stringList.size() != stringList1.size()){
+                if (stringList.size() != stringList1.size()) {
                     return rb.setMsg("认款选择的数据存在问题，请检查是否重复");
                 }
             }
@@ -1438,13 +1440,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         if (vo != null) {
                             AppOrderPriceInfoVo priceInfoVo = vo.getPriceInfo();
                             AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
-                            if(depositInfo != null){
+                            if (depositInfo != null) {
-                                if("02".equals(depositInfo.getDepositTypeKey())){//订金结转
+                                if ("02".equals(depositInfo.getDepositTypeKey())) {//订金结转
                                     BigDecimal decimalDeposit = BigDecimal.ZERO;
-                                    if(StringUtils.isNotBlank(depositInfo.getDepositTotal())){
+                                    if (StringUtils.isNotBlank(depositInfo.getDepositTotal())) {
                                         decimalDeposit = new BigDecimal(depositInfo.getDepositTotal());
                                     }
-                                    if(StringUtils.isNotBlank(depositInfo.getMakeUpDeposit())){
+                                    if (StringUtils.isNotBlank(depositInfo.getMakeUpDeposit())) {
                                         decimalDeposit = decimalDeposit.subtract(new BigDecimal(depositInfo.getMakeUpDeposit()));
                                     }
                                     decimalDeposit = decimalDeposit.divide(new BigDecimal(priceInfoVo.getNumber()), BigDecimal.ROUND_CEILING);
@@ -1496,7 +1498,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             }
                             //根据busVinSid查询待出库中是否存在该数据
                             ResultBean<BusDelivered> busDeliveredResultBean = busDeliveredFeign.selectByBusVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
-                            if(busDeliveredResultBean.getData() == null){
+                            if (busDeliveredResultBean.getData() == null) {
                                 if (leftAll.compareTo(rightAll) <= 0) {//推送待出库
                                     BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
                                     busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
@@ -1635,8 +1637,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             bdCustomer.setTOrgIds(customerQuery.getOrgCode());
             ResultBean resultBean = bdCustomerService.draftBdCustomer(bdCustomer);
             log.info("推送客户{}", resultBean);
-        }else{
+        } else {
-            log.info("已存在客户{}",customerQuery.getCustomerNo());
+            log.info("已存在客户{}", customerQuery.getCustomerNo());
         }
         return customerQuery.getCustomerNo();
     }
@@ -2227,7 +2229,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         if (confirmation == null) {
             return rb.setMsg("该申请不存在");
         }
-        finSelectedReceivablesDetailedService.updateAuditStateBySid(1,sid);
+        finSelectedReceivablesDetailedService.updateAuditStateBySid(1, sid);
         ResultBean resultBean = cashierConfirm(sid, confirmation.getConfirmNameSid());
         return resultBean;
     }
@@ -2268,7 +2270,87 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
 
     public ResultBean<String> selectCollectionMoneys(String contractId, List<String> busVinSidList) {
         ResultBean<String> rb = ResultBean.fireFail();
-        String moneyAll = baseMapper.selectCollectionMoneys(contractId,busVinSidList);
+        String moneyAll = baseMapper.selectCollectionMoneys(contractId, busVinSidList);
         return rb.success().setData(moneyAll);
     }
+
+    public PagerVo<FinCollectionConfirmationJYDDKYDJVo> jyddkydjListPage(PagerQuery<FinCollectionConfirmationJYDDKYDJQuery> pq) {
+        FinCollectionConfirmationJYDDKYDJQuery query = pq.getParams();
+        QueryWrapper<FinCollectionConfirmation> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getCreateBySid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("fcc.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("fcc.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("fcc.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("fcc.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("fcc.createBySid", query.getCreateBySid());
+                } else {
+                    PagerVo<FinCollectionConfirmationJYDDKYDJVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<FinCollectionConfirmationJYDDKYDJVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        qw.gt("fcc.balance", 0);
+        if (StringUtils.isNotBlank(query.getStaffDeptName())){
+            qw.like("fcc.staffDeptName",query.getStaffDeptName());
+        }
+        if (StringUtils.isNotBlank(query.getStaffName())){
+            qw.like("fcc.staffName",query.getStaffName());
+        }
+        if (StringUtils.isNotBlank(query.getBillNo())){
+            qw.like("fcc.billNo",query.getBillNo());
+        }
+        if (StringUtils.isNotBlank(query.getPayerName())){
+            qw.like("fcc.payerName",query.getPayerName());
+        }
+        if (StringUtils.isNotBlank(query.getPhone())){
+            qw.like("bd.draweeMobile",query.getPhone());
+        }
+        String collectionStartDate = query.getCollectionStartDate();
+        String collectionEndDate = query.getCollectionEndDate();
+        qw.apply(StringUtils.isNotEmpty(collectionStartDate), "date_format (fcc.collectionDate,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(collectionEndDate), "date_format (fcc.collectionDate,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+                );
+        String collectionSmallMoney = query.getCollectionSmallMoney();
+        String collectionBigMoney = query.getCollectionBigMoney();
+        qw.between("fcc.balance",collectionSmallMoney,collectionBigMoney);
+        IPage<FinCollectionConfirmation> page = PagerUtil.queryToPage(pq);
+        IPage<FinCollectionConfirmationJYDDKYDJVo> pagging = baseMapper.jyddkydjListPage(page, qw);
+        List<FinCollectionConfirmationJYDDKYDJVo> records = pagging.getRecords();
+        for (FinCollectionConfirmationJYDDKYDJVo record : records) {
+            String useOrgSid = record.getUseOrgSid();
+            String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
+            record.setUseOrgName(useOrgName);
+        }
+        PagerVo<FinCollectionConfirmationJYDDKYDJVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -303,9 +303,8 @@
         fd.useOrgSid
         from fin_selected_receivables_detailed fd
         left join fin_uncollected_receivables_detailed furd on furd.sid = fd.receivablesSid
-        where fd.receivablesName != '订金' and fd.auditState = 3
         <where>
-            ${ew.sqlSegment}
+            ${ew.sqlSegment} and fd.receivablesName != '订金' and fd.auditState = 3
             <if test="name != null and name != ''">
                 and concat(IFNULL(fd.customerName
                 , '')

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -332,9 +332,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         FinSelectedReceivablesPaymentDetailsQuery params = pagerQuery.getParams();
         QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(pagerQuery.getParams().getPurchaseSystemSid())) {
-            qw.eq("purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
+            qw.eq("furd.purchaseSystemSid", pagerQuery.getParams().getPurchaseSystemSid());
         } else {
-            qw.eq("purchaseSystemSid", "0");
+            qw.eq("furd.purchaseSystemSid", "0");
         }
         String useOrgSid = "";
         String orgPath = pagerQuery.getParams().getOrgPath();
@@ -345,10 +345,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         }
         if (StringUtils.isNotBlank(useOrgSid)) {
-            qw.eq("useOrgSid", useOrgSid);
+            qw.eq("fd.useOrgSid", useOrgSid);
         }
         if (StringUtils.isNotBlank(userSid)) {
-            qw.eq("createBySid", userSid);
+            qw.eq("fd.createBySid", userSid);
         }
         //查询没有认完的车辆sid
        /* List<String> stringList = baseMapper.selectUnSelectList(pagerQuery.getParams().getPurchaseSystemSid(),userSid,useOrgSid);
@@ -396,6 +396,18 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
             }
         } else {
             for (FinSelectReceivablesDetailedVo record : collList) {
+                BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney());
+                BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney());
+                if(currentMoney.compareTo(BigDecimal.ZERO)<=0){
+                    record.setReveivableMoney("0");
+                }else{
+                    BigDecimal bigDecimal1 = currentMoney.subtract(subscriptionMoney);
+                    if(bigDecimal1.compareTo(BigDecimal.ZERO)<=0){
+                        record.setReveivableMoney("0");
+                    }else{
+                        record.setReveivableMoney(bigDecimal1.toString());
+                    }
+                }
                 record.setSubscribedOf(1);
                 String busVinSid = record.getBusVinSid();
                 ResultBean<BusSalesOrderVehicle> resultBean = busSalesOrderVehicleFeign.details(busVinSid);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java

@@ -1,8 +1,10 @@
 package com.yxt.anrui.portal.biz.sysflowableconfig;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.portal.api.sysflowableconfig.*;
 import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;
 
@@ -30,13 +32,27 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
         ResultBean<SysFlowableConfigVo> rb = ResultBean.fireFail();
         SysFlowableConfigVo sysFlowableConfigVo = baseMapper.initDetails(userSid);
         if(sysFlowableConfigVo != null){
+            if(StringUtils.isBlank(sysFlowableConfigVo.getStartDate())){
+                sysFlowableConfigVo.setStartDate(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm"));
+            }
+            sysFlowableConfigVo.setStartDateLong(System.currentTimeMillis());
+        }else{
+            sysFlowableConfigVo = new SysFlowableConfigVo();
+            sysFlowableConfigVo.setStartDate(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm"));
             sysFlowableConfigVo.setStartDateLong(System.currentTimeMillis());
+            sysFlowableConfigVo.setUserSid(userSid);
         }
         return rb.success().setData(sysFlowableConfigVo);
     }
 
     public ResultBean saveOrUpdateDto(SysFlowableConfigDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isNotBlank(dto.getEndDate())){
+            int res=dto.getEndDate().compareTo(dto.getStartDate());
+            if(res<=0){
+                return rb.setMsg("结束时间需要比开始时间大");
+            }
+        }
         //查询是否包含该用户的数据
         SysFlowableConfig sysFlowableConfig = baseMapper.selectByUserSids(dto.getUserSid());
         if(sysFlowableConfig != null){
@@ -45,6 +61,7 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
         sysFlowableConfig = new SysFlowableConfig();
         BeanUtil.copyProperties(dto,sysFlowableConfig,"sid");
         String name = baseMapper.selectBySid(dto.getChangeUserSid());
+        sysFlowableConfig.setChangeName(name);
         baseMapper.insert(sysFlowableConfig);
         return rb.success();
     }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@@ -154,4 +154,6 @@ public class ScmApplyInbound extends BaseEntity {
     @ApiModelProperty("最新更新时间")
     private String newUpdateDate; // 最新更新时间
 
+    private String cancalRemarks;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeign.java

@@ -98,5 +98,5 @@ public interface ScmApplyInboundFeign {
 
     @ApiOperation(value = "入库申请终止")
     @PostMapping(value = "/cancal")
-    ResultBean cancal(@RequestParam("sid")String sid);
+    ResultBean cancal(@RequestParam("sid")String sid,@RequestParam("cancalRemarks")String cancalRemarks);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundFeignFallback.java

@@ -108,7 +108,7 @@ public class ScmApplyInboundFeignFallback implements ScmApplyInboundFeign {
     }
 
     @Override
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
         return null;
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml

@@ -34,6 +34,9 @@
         <if test="procInsId != null and procInsId != ''">
             , procInsId=#{procInsId}
         </if>
+        <if test="cancalRemarks != null and cancalRemarks != ''">
+            , cancalRemarks=#{cancalRemarks}
+        </if>
         WHERE sid=#{sid}
     </update>
 

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java

@@ -117,7 +117,7 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign {
 	}
 
 	@Override
-	public ResultBean cancal(String sid) {
+	public ResultBean cancal(String sid,String cancalRemarks) {
-		return scmApplyInboundService.cancal(sid);
+		return scmApplyInboundService.cancal(sid,cancalRemarks);
 	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -972,7 +972,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         return baseMapper.selectNum(bill);
     }
 
-    public ResultBean cancal(String sid) {
+    public ResultBean cancal(String sid,String cancalRemarks) {
         ResultBean rb = ResultBean.fireFail();
         ScmApplyInbound scmApplyInbound = fetchBySid(sid);
         if ("已办结".equals(scmApplyInbound.getNodeState())) {
@@ -989,11 +989,13 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 return rb.setMsg(resultBean.getMsg());
             }
             Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+            map.put("cancalRemarks",cancalRemarks);
             updateFlowFiled(map);
             return rb.success().setData(resultBean.getData());
         } else {
             scmApplyInbound.setNodeState("终止");
             scmApplyInbound.setTaskDefKey("Event_end");
+            scmApplyInbound.setCancalRemarks(cancalRemarks);
             baseMapper.updateById(scmApplyInbound);
         }
         return rb.success();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -299,6 +299,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
         List<ScmVehicleGressionPageVo> records = iPage.getRecords();
         for (ScmVehicleGressionPageVo record : records) {
+            //根据sid查询该申请下的车辆
+            List<String> vinList = scmVehicleGressionVehService.selectByMainSid(record.getSid());
+            String vin = String.join(",",vinList);
+            record.setVin(vin);
             if(query.getUserSid().equals(record.getCreateBySid())){
                 record.setAllowModify(true);
             }else{

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.java

@@ -75,4 +75,6 @@ public interface ScmVehicleGressionVehMapper extends BaseMapper<ScmVehicleGressi
 
     @Select("select * from scm_vehicle_gression_veh where vehVin =#{vin} ")
     List<ScmVehicleGressionVehDetailsVo> fetchVoByVins(@Param("vin") String vin);
+
+    List<String> selectByMainSid(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehMapper.xml

@@ -12,4 +12,8 @@
         SELECT * FROM scm_vehicle_gression_veh
         <where>${ew.sqlSegment}</where>
     </select>
+
+    <select id="selectByMainSid" resultType="java.lang.String">
+        select vehVin from scm_vehicle_gression_veh where mainSid = #{sid}
+    </select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegressionveh/ScmVehicleGressionVehService.java

@@ -126,4 +126,8 @@ public class ScmVehicleGressionVehService extends MybatisBaseService<ScmVehicleG
             baseMapper.insert(scmVehicleGressionVeh);
         }
     }
+
+    public List<String> selectByMainSid(String sid) {
+        return baseMapper.selectByMainSid(sid);
+    }
 }

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@@ -51,7 +51,7 @@
             <el-table-column fixed label="操作" align="center" width="220">
               <template slot-scope="scope">
                 <el-button type="primary" size="small" :disabled="scope.row.offlineDate !==''" @click="handleUpdate(scope.row)">编辑</el-button>
-                <el-button type="danger" size="small" :disabled="scope.row.offlineDate !==''" @click="handleCancellation(scope.row)">作废</el-button>
+                <el-button type="danger" size="small" :disabled="scope.row.offlineDate !=='' || scope.row.orderStatus == '已作废'" @click="handleCancellation(scope.row)">作废</el-button>
                 <el-button type="primary" size="small" @click="handleLooK(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -88,6 +88,20 @@
     <div-info v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
     <!-- 车辆详情标准页面-->
     <vehicleconfiguration  v-show="viewState == 5" ref="divPeizhi" @doback="resetState"/>
+    <!-- 作废说明 -->
+    <el-dialog title="作废说明" :append-to-body="true" :visible.sync="dialogVisible">
+      <el-form ref="" :model="formobj" class="formadd">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="24" class="tleftb">
+            <el-form-item><el-input v-model="formobj.cancalRemarks" clearable placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="handleConfirm">确 定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -117,6 +131,7 @@ export default {
       viewState: 1, // 1、列表 2、添加 3、修改 4、查看
       isSearchShow: false, // 显示隐藏
       tableLoading: false,
+      dialogVisible: false,
       // 下拉框
       billType_list: [], // 单据类型
       // 列表数据
@@ -149,7 +164,10 @@ export default {
           orgPath: ''
         }
       },
-      row: {}
+      formobj: {
+        sid: '',
+        cancalRemarks: ''
+      }
     }
   },
   created() {
@@ -178,19 +196,22 @@ export default {
       this.$refs['divadd'].showEdit(row)
     },
     handleCancellation(row) {
-      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.dialogVisible = true
-      this.$confirm(tip, '提示', {
+      this.cancalRemarks = ''
-        confirmButtonText: '确定',
+      this.formobj.sid = row.sid
-        cancelButtonText: '取消',
+    },
-        type: 'warning'
+    handleConfirm() {
-      }).then(() => {
+      if (this.formobj.cancalRemarks === '') {
-        req.cancal({ sid: row.sid }).then((res) => {
+        this.$message({ showClose: true, type: 'error', message: '请填写作废说明' })
+        return
+      }
+      req.cancal(this.formobj).then((res) => {
         if (res.success) {
+          this.dialogVisible = false
           this.$message({ showClose: true, type: 'success', message: '操作成功' })
           this.loadList()
         }
       })
-      })
     },
     handleLooK(row) {
       this.viewState = 4

anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/trailerout.vue

@@ -181,7 +181,7 @@ export default {
       this.centerDialogVisible = true
       var params = {
         deployId: row.procDefId,
-        procInsId: row.procInstId,
+        procInsId: row.procInstSid,
         token: getStorage()
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))

anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutAdd.vue

@@ -71,8 +71,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
+              <div class="span-sty"><span>开票名称</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -82,6 +82,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -153,7 +159,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
     }
   },
@@ -270,7 +278,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()

anrui-scm/anrui-scm-ui/src/views/guache/guachechuku/traileroutInfo.vue

@@ -67,8 +67,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
+              <div class="span-sty"><span>开票名称</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -78,6 +78,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -147,7 +153,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
     }
   },
@@ -215,7 +223,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
       this.$emit('doback')
     }

anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue

@@ -44,7 +44,7 @@
               <template slot-scope="scope">
                 <el-button :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" type="primary" size="small" @click="toEdit(scope.row)">办理
                 </el-button>
-                <el-button type="danger" :disabled="scope.row.nodeState =='已办结' ? true : scope.row.nodeState == '已终止' ? true : false" size="small" @click="toTermination(scope.row)">终止</el-button>
+                <el-button type="danger" :disabled="scope.row.nodeState =='已办结' ? true : scope.row.nodeState == '终止' ? true : false" size="small" @click="toTermination(scope.row)">终止</el-button>
                 <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -85,6 +85,20 @@
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
       <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
     </el-dialog>
+    <!-- 作废说明 -->
+    <el-dialog title="终止说明" :append-to-body="true" :visible.sync="dialogVisible">
+      <el-form ref="" :model="formobj" class="formadd">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="24" class="tleftb">
+            <el-form-item><el-input v-model="formobj.cancalRemarks" clearable placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="handleConfirm">确 定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -118,6 +132,7 @@ export default {
       viewState: 1, // 1、列表 2、添加 3、修改 4、查看
       isSearchShow: false, // 显示隐藏
       tableLoading: false,
+      dialogVisible: false,
       // 列表数据
       dataList: [],
       btnList: [
@@ -132,7 +147,6 @@ export default {
       multipleSelection: [],
       // sid数组
       sids: [], // 用于导出的时候保存已选择SID
-      sides: '', // 一条数据的sid
       queryParams: {
         current: 1,
         size: 10,
@@ -147,7 +161,10 @@ export default {
           pcApplicationCode: ''
         }
       },
-      row: {}
+      formobj: {
+        sid: '',
+        cancalRemarks: ''
+      }
     }
   },
   created() {
@@ -213,8 +230,6 @@ export default {
         aa.push(element.sid)
       })
       this.sids = aa
-      this.row = row
-      this.sides = this.sids.join() // 将sid数组的元素转化成字符串
       console.log('获取sids数组', this.sids)
     },
     toEdit(row) {
@@ -229,19 +244,22 @@ export default {
       this.$refs['divinfo'].showInfo(sid, row)
     },
     toTermination(row) {
-      const tip = '请确认是否终止该记录?'
+      this.dialogVisible = true
-      this.$confirm(tip, '提示', {
+      this.formobj.sid = row.sid
-        confirmButtonText: '确定',
+      this.formobj.cancalRemarks = ''
-        cancelButtonText: '取消',
+    },
-        type: 'warning'
+    handleConfirm() {
-      }).then(() => {
+      if (this.formobj.cancalRemarks === '') {
-        req.cancal({ sid: row.sid }).then((res) => {
+        this.$message({ showClose: true, type: 'error', message: '请填写终止说明' })
+        return
+      }
+      req.cancal(this.formobj).then((res) => {
         if (res.success) {
           this.$message({ showClose: true, type: 'success', message: '操作成功' })
+          this.dialogVisible = false
           this.loadList()
         }
       })
-      })
     },
     hangleLook(row) {
       this.viewState = 5
@@ -272,16 +290,19 @@ export default {
     },
     // 加载分页列表
     loadList() {
-      const _this = this
       this.tableLoading = true
       req.listPage(this.queryParams).then(resp => {
-        console.log('查询列表', resp)
+        this.tableLoading = false
-        _this.tableLoading = false
+        if (resp.success) {
           const data = resp.data
-        _this.queryParams.total = data.total
+          this.queryParams.total = data.total
-        _this.dataList = data.records
+          this.dataList = data.records
+        } else {
+          this.queryParams.total = 0
+          this.dataList = []
+        }
       }).catch(() => {
-        _this.tableLoading = false
+        this.tableLoading = false
       })
     },
     // 序号

anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue

@@ -113,6 +113,20 @@
     <el-dialog :append-to-body="true" :visible.sync="dialogImgVisible">
       <img width="100%" :src="dialogImageUrl" alt="" />
     </el-dialog>
+    <!-- 作废说明 -->
+    <el-dialog title="作废说明" :append-to-body="true" :visible.sync="dialogVisible">
+      <el-form ref="" :model="formobj" class="formadd">
+        <el-row style="border-top: 1px solid #E0E3EB">
+          <el-col :span="24" class="tleftb">
+            <el-form-item><el-input v-model="formobj.cancalRemarks" clearable placeholder=""/></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="handleConfirm">确 定</el-button>
+        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -150,7 +164,7 @@ export default {
       isSearchShow: false,
       searchxianshitit: '显示查询条件',
       dialogImgVisible: false,
-      dialogFileVisible: false,
+      dialogVisible: false,
       // 查询条件 -----------
       tableKey: 0,
       list: [],
@@ -202,6 +216,10 @@ export default {
       },
       dialogImageUrl: '',
       imgList: [],
+      formobj: {
+        sid: '',
+        cancalRemarks: ''
+      },
       rules: {}
     }
   },
@@ -307,19 +325,22 @@ export default {
       })
     },
     handCancellation(row) {
-      const tip = '请确认是否作废该记录?'
+      this.dialogVisible = true
-      this.$confirm(tip, '提示', {
+      this.cancalRemarks = ''
-        confirmButtonText: '确定',
+      this.formobj.sid = row.sid
-        cancelButtonText: '取消',
+    },
-        type: 'warning'
+    handleConfirm() {
-      }).then(() => {
+      if (this.formobj.cancalRemarks === '') {
-        req.cancel({ sid: row.sid }).then((res) => {
+        this.$message({ showClose: true, type: 'error', message: '请填写作废说明' })
+        return
+      }
+      req.cancel(this.formobj).then((res) => {
         if (res.success) {
+          this.dialogVisible = false
           this.$message({ showClose: true, type: 'success', message: '操作成功' })
           this.getList()
         }
       })
-      })
     },
     handleGetCheck(row) {
       this.dialogImgVisible = true

anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@@ -67,7 +67,7 @@
             <el-table-column width="220px" prop="applyId" label="申请编号" align="center"/>
             <el-table-column width="140px" prop="applyDate" label="申请日期" align="center"/>
             <el-table-column width="130px" prop="applyName" label="申请人" align="center"/>
-<!--            <el-table-column width="180px" prop="vin" label="车架号" align="center"/>-->
+            <el-table-column width="150px" prop="vin" label="车架号" align="center"/>
             <el-table-column width="160px" prop="location" label="现存放地点" align="center"/>
             <el-table-column width="160px" prop="targetLocation" label="目标存放地点" align="center"/>
             <el-table-column width="130px" prop="operator" label="经办人" align="center"/>

anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuDaiBanInfo.vue

@@ -69,8 +69,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
+              <div class="span-sty"><span>开票名称</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -80,6 +80,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -174,7 +180,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       },
       operation: '', // 点击操作按钮
       dialogList: {

anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuEdit.vue

@@ -70,8 +70,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
+              <div class="span-sty"><span>开票名称</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -81,6 +81,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -152,7 +158,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       }
     }
   },

anrui-scm/anrui-scm-ui/src/views/workFlow/guachechukuFlow/chukuYiBanInfo.vue

@@ -67,8 +67,8 @@
           </el-row>
           <el-row>
             <el-col :span="16">
-              <div class="span-sty"><span>开票信息</span></div>
+              <div class="span-sty"><span>开票名称</span></div>
-              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -78,6 +78,12 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty"><span>开票信息</span></div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <el-row>
             <el-col :span="24">
               <div class="span-sty"><span>备注</span></div>
@@ -147,7 +153,9 @@ export default {
         nodeSid: '',
         procDefId: '',
         procInstSid: '',
-        taskId: ''
+        taskId: '',
+        openTickName: '',
+        openTickSid: ''
       },
       // 环节所需参数
       linkByParameter: {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -97,5 +97,5 @@ public interface AppFinCollectionConfirmationFeign {
 
     @ApiOperation("查询已认款列表")
     @PostMapping("/selectPageList")
-    ResultBean<CollectedReceivablesDetailedVo> selectPageList(@RequestBody PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery);
+    ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(@RequestBody PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -98,7 +98,7 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	}
 
 	@Override
-	public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+	public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
 		return null;
 	}
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/CollectedReceivablesDetailedVo.java

@@ -41,7 +41,6 @@ public class CollectedReceivablesDetailedVo implements Vo {
 
 
     @ApiModelProperty("剩余金额")
-    @JsonProperty("receivable")
     private String reveivableMoney;
     @ApiModelProperty("业务车辆sid")
     private String busVinSid;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -148,7 +148,7 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
     }
 
     @Override
-    public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+    public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
         return appfinCollectionConfirmationService.selectPageList(pagerQuery);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -29,6 +29,9 @@ package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesPaymentDetailsQuery;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
@@ -62,6 +65,8 @@ public class AppFinCollectionConfirmationService {
     FinCollectionConfirmationFeign finCollectionConfirmationFeign;
     @Autowired
     FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
 
 
     /**
@@ -224,7 +229,14 @@ public class AppFinCollectionConfirmationService {
         return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
 
-    public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+    public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
-        return null;
+        ResultBean<PagerVo<CollectedReceivablesDetailedVo>> rb = ResultBean.fireFail();
+        PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> paymentDetailsList = finSelectedReceivablesDetailedFeign.selectPageList(pq);
+        List<CollectedReceivablesDetailedVo> voList = Optional.ofNullable(paymentDetailsList.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), CollectedReceivablesDetailedVo.class)).collect(Collectors.toList());
+        PagerVo<CollectedReceivablesDetailedVo> v = new PagerVo<>();
+        BeanUtil.copyProperties(paymentDetailsList.getData(), v);
+        v.setRecords(voList);
+        return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
 }