问题优化

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

@@ -233,7 +233,9 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 map.put("selectType", 0);
                 appSubVersionVo.setJson(JSONObject.toJSONString(map));
                 BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo);
+                BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(modelSid);
                 vos.setCarDetailPage(appVehicleVersionVo);
+                vos.setVehicleAlias(baseVehicleModel.getModelName());
             });
         }
         baseModelModpriceDetailVo.setBaseModelModpriceModels(baseModelModpriceModelVos);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -65,7 +65,7 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("根据sid查询车辆 详情")
     @GetMapping("/details/{sid}")
     @ResponseBody
-    ResultBean<BusSalesOrderVehicle> details(@PathVariable("sid")String sid);
+    ResultBean<BusSalesOrderVehicle> details(@PathVariable("sid") String sid);
 
     @ApiOperation("根据车辆sid查询")
     @GetMapping("/fetchByVehSid/{vehSid}")
@@ -75,12 +75,12 @@ public interface BusSalesOrderVehicleFeign {
     @ApiOperation("根据销售订单车辆表的sid更新临时号码")
     @PostMapping("/updateTemporaryNo")
     @ResponseBody
-    ResultBean updateTemporaryNo(@RequestParam("sid")String sid,@RequestParam("temporaryNo")String temporaryNo);
+    ResultBean updateTemporaryNo(@RequestParam("sid") String sid, @RequestParam("temporaryNo") String temporaryNo);
 
     @ApiOperation("根据sid查询")
     @GetMapping("/fetchBySalesOrderVehiclerSid/{busVinSid}")
     @ResponseBody
-    ResultBean<BusSalesOrderVehicle> fetchBySalesOrderVehiclerSid(@PathVariable("busVinSid")String busVinSid);
+    ResultBean<BusSalesOrderVehicle> fetchBySalesOrderVehiclerSid(@PathVariable("busVinSid") String busVinSid);
 
     @ApiOperation("移动端-欠款开票选择车辆分页列表")
     @PostMapping("/appVehicleQKKPList")
@@ -98,4 +98,9 @@ public interface BusSalesOrderVehicleFeign {
     @GetMapping("/fetchByLSBM/{fNumber}")
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> fetchByLSBM(@PathVariable("fNumber") String fNumber);
+
+    @ApiOperation("根据合同编号和车辆sid查询销售订单车辆信息")
+    @PostMapping("/selectByNoAndVinSid")
+    @ResponseBody
+    ResultBean<BusSalesOrderVehicle> selectByNoAndVinSid(@RequestParam("contractNo") String contractNo, @RequestParam("vehSid") String vehSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -93,4 +93,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectByNoAndVinSid(String contractNo, String vehSid) {
+        return null;
+    }
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -76,7 +76,7 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
 
     @Override
     public ResultBean updateTemporaryNo(String sid, String temporaryNo) {
-        return busSalesOrderVehicleService.updateTemporaryNo(sid,temporaryNo);
+        return busSalesOrderVehicleService.updateTemporaryNo(sid, temporaryNo);
     }
 
     @Override
@@ -105,4 +105,11 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
     public ResultBean<BusSalesOrderVehicle> fetchByLSBM(String fNumber) {
         return busSalesOrderVehicleService.fetchByLSBM(fNumber);
     }
+
+    @Override
+    public ResultBean<BusSalesOrderVehicle> selectByNoAndVinSid(String contractNo, String vehSid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vehSid);
+        return rb.success().setData(busSalesOrderVehicle);
+    }
 }

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

@@ -142,4 +142,6 @@ public class FinBillApplication extends BaseEntity {
     private String billNo; // 单据编号
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 }

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

@@ -146,6 +146,8 @@ public class FinBillApplicationDto implements Dto {
     private String billNo;
     @ApiModelProperty("提前领取发票原件原因")
     private String reason;
+    @ApiModelProperty("欠款开票单据编号（欠款领票使用）")
+    private String qkkpBillNo;
 
     @ApiModelProperty("开票车辆信息")
     private List<FinBillVehicleDto> finBillVehicles;

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

@@ -84,6 +84,8 @@ public class FinBillApplicationVo implements Vo {
     private String reason;
     @ApiModelProperty("欠款开票单据编号")
     private String qkkpBillNo;
+    @ApiModelProperty("是否存在欠款领票申请")
+    private Boolean isExistQKLP;
 
     @ApiModelProperty(value = "流程id")
     private String procDefId;

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

@@ -76,4 +76,7 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
     List<FinBillApplicationDetailsVo> selectByContractNo(String contractNo);
 
     int selectBySid(String join);
+
+    @Select("select * from fin_bill_application where qkkpBillNo = #{qkkpBillNo}")
+    FinBillApplicationDetailsVo fetchByQkkpBillNo(String qkkpBillNo);
 }

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

@@ -53,6 +53,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.finbillapplication.*;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillCompleteDto;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@@ -65,11 +67,14 @@ import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto;
 import com.yxt.anrui.fin.biz.finbillapplicationpublic.FinBillApplicationPublicService;
 import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService;
 import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService;
 import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService;
+import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
+import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
 import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -95,6 +100,7 @@ import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.kafka.common.metrics.stats.Sum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -139,6 +145,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     @Autowired
     private BusSalesOrderFeign busSalesOrderFeign;
     @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
     private MessageFeign messageFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
@@ -152,6 +160,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     private FinVehicleInvoiceService finVehicleInvoiceService;
     @Autowired
     private BaseDistributorFeign baseDistributorFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
+    @Autowired
+    private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
 
     private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -161,7 +173,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
             query.setUseOrgSid(useOrgSid);
         }
-        qw.ne("fba.billStateKey", "003");
+        qw.and(wrapper -> wrapper.eq("fba.billStateKey", "001").or().eq("fba.billStateKey", "002"));
         qw.eq("fba.useOrgSid", query.getUseOrgSid());
         qw.eq("fba.createBySid", query.getCreateBySid());
         if (StringUtils.isNotBlank(query.getSaleTypeKey())) {
@@ -1307,6 +1319,22 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setBillStateKey("003");
             finBillApplication.setBillStateValue("欠款开票");
             finBillApplication.setNum(finBillVehicles.size());
+            //计算欠款金额合计
+            FinBillVehicleDto finBillVehicleDto1 = finBillVehicles.get(0);
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(dto.getContractNo(), finBillVehicleDto1.getVehSid()).getData();
+            //应收金额
+            BigDecimal unYs = new BigDecimal(finUncollectedReceivablesDetailedService.fetchSumYS(busSalesOrderVehicle.getSid()));
+            List<String> ysSids = finUncollectedReceivablesDetailedService.fetchYsSidByOrderVehSid(busSalesOrderVehicle.getSid());
+            //已收金额
+            BigDecimal seYs = new BigDecimal("0");
+            for (String ysSid : ysSids) {
+                seYs = seYs.add(new BigDecimal(finSelectedReceivablesDetailedService.fetchSumSeYsByReceivablesSid(ysSid)));
+            }
+            //单台欠款金额
+            BigDecimal qkMoneyOne = unYs.subtract(seYs);
+            //欠款金额合计
+            BigDecimal qkMoneyTotal = qkMoneyOne.multiply(new BigDecimal(finBillVehicles.size()));
+            finBillApplication.setArrearsMoney(qkMoneyTotal.toString());
             save(finBillApplication);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
@@ -1470,6 +1498,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
         List<FinBillFileDto> fjApplicationAppendxs = dto.getFjApplicationAppendxs();
         if (StringUtils.isBlank(dtoSid)) {//新增
+            String qkkpBillNo = dto.getBillNo();
+            FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(qkkpBillNo);
+            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")){
+                return rb.setMsg("该欠款开票的领票申请已存在");
+            }
             FinBillApplication finBillApplication = new FinBillApplication();
             BeanUtil.copyProperties(dto, finBillApplication, "sid");
             finBillApplication.setNodeState("待提交");
@@ -1695,6 +1728,56 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+                List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
+                List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                    finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                    finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                    finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                    finVehicleInvoiceDto.setVIN(finBillVehicleVo.getVinNo());
+                    finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleVo.getBillTypeKey());
+                    finVehicleInvoiceDto.setInvoiceType(finBillVehicleVo.getBillTypeValue());
+                    finVehicleInvoiceDto.setInvoiceAmount(finBillApplication.getOneBillMoney());
+                    finVehicleInvoiceDto.setBillingStateKey("001");
+                    finVehicleInvoiceDto.setBillingState("未开票");
+                    finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
+                    finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                    finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                    finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                    finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                    BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillVehicleVo.getOpenTickSid()).getData();
+                    finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                    finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                    finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                    finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                    finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
+                }
+                if (finBillTrailerVos != null) {
+                    for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                        FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
+                        finVehicleInvoiceDto.setInvoiceTitle(finBillApplication.getOpenTickUnitName());
+                        finVehicleInvoiceDto.setContractNo(finBillApplication.getContractNo());
+                        finVehicleInvoiceDto.setCustomerName(finBillApplication.getCustomerName());
+                        finVehicleInvoiceDto.setVIN(finBillTrailerVo.getGcVinNo());
+                        finVehicleInvoiceDto.setInvoiceTypeKey(finBillTrailerVo.getBillTypeKey());
+                        finVehicleInvoiceDto.setInvoiceType(finBillTrailerVo.getBillTypeValue());
+                        finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(finBillTrailerVo.getOneBillMoney()));
+                        finVehicleInvoiceDto.setBillingStateKey("001");
+                        finVehicleInvoiceDto.setBillingState("未开票");
+                        finVehicleInvoiceDto.setInvoicingName(finBillTrailerVo.getOpenTickName());
+                        finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
+                        finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
+                        finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
+                        finVehicleInvoiceDto.setUseOrgSid(finBillApplication.getUseOrgSid());
+                        BaseDistributorListVo baseDistributorListVo = baseDistributorFeign.selectDisListBySid(finBillTrailerVo.getOpenTickSid()).getData();
+                        finVehicleInvoiceDto.setAddress(baseDistributorListVo.getRegistDetailAddress());
+                        finVehicleInvoiceDto.setTelPhone(baseDistributorListVo.getInvoPhone());
+                        finVehicleInvoiceDto.setOpeningBank(baseDistributorListVo.getInvoBank());
+                        finVehicleInvoiceDto.setBankNum(baseDistributorListVo.getInvoBankNum());
+                        finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
+                    }
+                }
                 BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(finBillApplication.getContractNo()).getData();
                 BigDecimal oneBillMoney = busSalesOrder.getOneBillMoney();
                 if (oneBillMoney == null) {
@@ -2014,6 +2097,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 );
         IPage<FinBillApplication> page = PagerUtil.queryToPage(pq);
         IPage<FinBillApplicationVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (FinBillApplicationVo record : pagging.getRecords()) {
+            String qkkpBillNo = record.getBillNo();
+            FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.fetchByQkkpBillNo(qkkpBillNo);
+            if (finBillApplicationDetailsVo != null && !finBillApplicationDetailsVo.getNodeState().equals("终止")){
+                record.setIsExistQKLP(true);
+            }else {
+                record.setIsExistQKLP(false);
+            }
+        }
         PagerVo<FinBillApplicationVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -2159,14 +2251,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
     public ResultBean submitFinBillApplicationQKLP(SubmitFinBillApplicationDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        String dtoSid = dto.getSid();
-        FinBillApplication finBillApplication2 = fetchBySid(dtoSid);
-        if (!finBillApplication2.getNodeState().equals("已办结")){
-            return rb.setMsg("该申请仍在审核过程中，不可提交");
-        }
-        if (finBillApplication2.getIsLQOrigInvoice().equals("是")){
-            return rb.setMsg("该申请已领取过发票原件，请重新选择");
-        }
         String contractNo = dto.getContractNo();
         List<FinBillApplicationDetailsVo> finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo);
         if (finBillApplicationDetailsVos != null) {
@@ -2195,14 +2279,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
         }
         dto.setOrgSidPath(orgSidPath);
-        finBillApplication2.setSid(null);
-        int r = submitBusinessDataPc(dto, finBillApplication2);
-        if (r == 3) {
-            return rb.setMsg("该申请不存在");
-        }
-        if (r == 0) {
-            return rb.setMsg("操作失败!提交的数据不一致");
-        }
         dto.setIsLQOrigInvoice("是");
         //新增修改保存
         ResultBean<String> resultBean = saveQKLP(dto);
@@ -2211,6 +2287,13 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         String businessSid = resultBean.getData();
         FinBillApplication finBillApplication1 = fetchBySid(businessSid);
+        int r = submitBusinessDataPc(dto, finBillApplication1);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值、若有网关，则赋值网关中判断的字段。
@@ -2218,7 +2301,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
         variables.put("app", appMap);
-        variables.put("isAdj", finBillApplication1.getIsLQOrigInvoice().equals("是"));
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -2271,8 +2353,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         variables.put("app", appMap);
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
-        //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
-        variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -2317,8 +2397,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         variables.put("app", appMap);
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
-        //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
-        variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -2365,8 +2443,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean rb = ResultBean.fireFail();
         FinBillApplication finBillApplication = fetchBySid(bv.getBusinessSid());
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
-        //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
-        bv.getFormVariables().put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -2428,8 +2504,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //查询业务信息
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
         bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId());
-        //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
-        variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<FinBillNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList());
@@ -2446,8 +2520,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //查询业务信息
         FinBillApplication finBillApplication = fetchBySid(query.getBusinessSid());
         bv.setModelId(ProcDefEnum.QKLPFINBILLAPPLICATION.getProDefId());
-        //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
-        variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<FinBillNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinBillNodeVo.class)).collect(Collectors.toList());
@@ -2476,8 +2548,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 Map<String, Object> appMap = new HashMap<>();
                 appMap.put("sid", businessSid);
                 variables.put("app", appMap);
-                //判断是否领取发票原件，若是，则isTrue网关参数为true=============添加
-                variables.put("isAdj", finBillApplication.getIsLQOrigInvoice().equals("是"));
                 flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -71,7 +71,7 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
 
     AppInvoicingInfoVinNoVo selDetailsByVinNo(@Param("vinNo") String vinNo);
 
-	@Select("select * from fin_bill_vehicle where vehSid = #{vehSid} and state = '1'")
+	@Select("select * from fin_bill_vehicle where vehSid = #{vehSid}")
 	FinBillVehicleDetailsVo fetchByVehSid(String vehSid);
 
 	@Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}")

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

@@ -125,4 +125,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
     List<FinSelectedReceivablesDetailed> fetchByReceivablesSid(String receivablesSid);
 
     String selectByVinSid(String busVinSid);
+
+    @Select("SELECT SUM(subscriptionMoney) AS seYs FROM fin_selected_receivables_detailed WHERE receivablesSid = #{ysSid} and auditState = 3")
+    String fetchSumSeYsByReceivablesSid(String ysSid);
 }

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

@@ -268,4 +268,8 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         String sumAll = baseMapper.selectByVinSid(busVinSid);
         return rb.success().setData(sumAll);
     }
+
+    public String fetchSumSeYsByReceivablesSid(String ysSid) {
+        return baseMapper.fetchSumSeYsByReceivablesSid(ysSid);
+    }
 }

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

@@ -89,4 +89,10 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
     FinUncollectedReceivablesDetailedPdfVo selectPdf(@Param("detailedSid") String detailedSid);
 
     List<ReceiveSeleteVo> receivedSelect(String busVinSid);
+
+    @Select("SELECT SUM(reveivableMoney) AS sumYS FROM fin_uncollected_receivables_detailed WHERE busVinSid = #{sid}")
+    String fetchSumYS(String sid);
+
+    @Select("SELECT sid FROM fin_uncollected_receivables_detailed WHERE busVinSid = #{sid}")
+    List<String> fetchYsSidByOrderVehSid(String sid);
 }

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

@@ -767,4 +767,12 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         }
         return rb.success().setData(receiveInvoiceVo);
     }
+
+    public String fetchSumYS(String sid) {
+        return baseMapper.fetchSumYS(sid);
+    }
+
+    public List<String> fetchYsSidByOrderVehSid(String sid) {
+        return baseMapper.fetchYsSidByOrderVehSid(sid);
+    }
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -14,7 +14,7 @@ public enum ProcDefEnum {
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
     FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"),
     QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"),
-    QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:1:1202504"),
+    QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:2:1365004"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     //    ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:2:1347504"),

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

@@ -33,6 +33,8 @@ public class AdvanceInvoicePageVo implements Vo {
     private Boolean showUpdateBtn;
     @ApiModelProperty("是否显示删除按钮")
     private Boolean showDeleteBtn;
+    @ApiModelProperty("是否显示领票按钮")
+    private Boolean showGetInvoiceBtn;
     @ApiModelProperty("车型")
     private String model;
     @ApiModelProperty("销售类型")

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

@@ -71,11 +71,6 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     ResultBean<PagerVo<AdvanceInvoicePageVo>> getAdvanceInvoiceLPList(@RequestBody PagerQuery<AdvanceInvoicePageQuery> pagerQuery);
 
-    @ApiOperation("移动端-新增欠款开票申请")
-    @PostMapping("/addAdvanceInvoice")
-    @ResponseBody
-    public ResultBean addAdvanceInvoice(@Valid @RequestBody AdvanceInvoiceVinDto dto);
-
     @ApiOperation("手机端-初始化欠款开票申请")
     @GetMapping("/initAdvanceInvoice")
     @ResponseBody
@@ -143,6 +138,11 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     ResultBean stopAdvanceInvoiceInfo(@RequestBody AdvanceInvoiceTaskQuery query);
 
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap AdvanceInvoiceQuery query);
+
     @ApiOperation("获取下一环节")
     @GetMapping("/getFlowOperateTitleBy")
     @ResponseBody
@@ -185,6 +185,11 @@ public interface AppBusAdvanceGinvoiceapplyFeign {
     @ResponseBody
     ResultBean stopAdvanceInvoiceInfoQKLP(@RequestBody AdvanceInvoiceTaskQuery query);
 
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitleQKLP")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitleQKLP(@SpringQueryMap AdvanceInvoiceQuery query);
+
     @ApiOperation("获取下一环节")
     @GetMapping("/getFlowOperateTitleByQKLP")
     @ResponseBody

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

@@ -58,11 +58,6 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
         return null;
     }
 
-    @Override
-    public ResultBean addAdvanceInvoice(AdvanceInvoiceVinDto dto) {
-        return null;
-    }
-
     @Override
     public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
         return null;
@@ -128,6 +123,11 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
         return null;
     }
 
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
         return null;
@@ -168,6 +168,11 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin
         return null;
     }
 
+    @Override
+    public ResultBean<String> getFlowOperateTitleQKLP(AdvanceInvoiceQuery query) {
+        return null;
+    }
+
     @Override
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
         return null;

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

@@ -29,4 +29,6 @@ public class CompleteAdvanceInvoiceDto implements Dto {
     @ApiModelProperty(value = "节点id")
     @NotBlank(message = "参数错误：taskDefKey")
     private String taskDefKey;
+
+    private String orgPath;
 }

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

@@ -65,11 +65,6 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
         return appBusAdvanceGinvoiceapplyService.getAdvanceInvoiceLPList(pagerQuery);
     }
 
-    @Override
-    public ResultBean addAdvanceInvoice(AdvanceInvoiceVinDto dto) {
-        return appBusAdvanceGinvoiceapplyService.addAdvanceInvoice(dto);
-    }
-
     @Override
     public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
         return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(query);
@@ -135,6 +130,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
         return appBusAdvanceGinvoiceapplyService.stopAdvanceInvoiceInfo(query);
     }
 
+    @Override
+    public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
+        return appBusAdvanceGinvoiceapplyService.getFlowOperateTitle(query);
+    }
+
     @Override
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleBy(AdvanceInvoiceQuery query) {
         return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleBy(query);
@@ -175,6 +175,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl
         return appBusAdvanceGinvoiceapplyService.stopAdvanceInvoiceInfoQKLP(query);
     }
 
+    @Override
+    public ResultBean<String> getFlowOperateTitleQKLP(AdvanceInvoiceQuery query) {
+        return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleQKLP(query);
+    }
+
     @Override
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
         return appBusAdvanceGinvoiceapplyService.getFlowOperateTitleByQKLP(query);

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

@@ -136,6 +136,15 @@ public class AppBusAdvanceGinvoiceapplyService {
                 advanceInvoicePageVo.setShowUpdateBtn(false);
                 advanceInvoicePageVo.setShowDeleteBtn(false);
             }
+            if (record.getNodeState().equals("已办结")) {
+                if (record.getIsExistQKLP()) {
+                    advanceInvoicePageVo.setShowGetInvoiceBtn(false);
+                } else {
+                    advanceInvoicePageVo.setShowGetInvoiceBtn(true);
+                }
+            } else {
+                advanceInvoicePageVo.setShowGetInvoiceBtn(false);
+            }
             advanceInvoicePageVos.add(advanceInvoicePageVo);
         }
         v.setRecords(advanceInvoicePageVos);
@@ -183,13 +192,6 @@ public class AppBusAdvanceGinvoiceapplyService {
         return rb.success().setData(v);
     }
 
-    public ResultBean addAdvanceInvoice(AdvanceInvoiceVinDto dto) {
-        AppAdvanceInvoiceVinDto appAdvanceInvoiceVinDto = new AppAdvanceInvoiceVinDto();
-        BeanUtil.copyProperties(dto, appAdvanceInvoiceVinDto);
-        ResultBean resultBean = busAdvanceGinvoiceapplyFeign.addAdvanceInvoice(appAdvanceInvoiceVinDto);
-        return resultBean;
-    }
-
     public ResultBean<AdvanceInvoiceInfoVo> initAdvanceInvoice(AdvanceInvoiceInfoQuery query) {
         ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
         AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
@@ -206,7 +208,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate());
         vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice());
         vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid());
-        vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney());
+        vo.setInvoiceTotal(finBillApplicationDetailsVo.getArrearsMoney());
         vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath());
         vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue());
         vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName());
@@ -686,6 +688,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
         BeanUtil.copyProperties(dto, finBillCompleteDto);
+        finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         ResultBean resultBean = finBillApplicationFeign.completeQK(finBillCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -707,6 +710,7 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         FinBillCompleteDto finBillCompleteDto = new FinBillCompleteDto();
         BeanUtil.copyProperties(dto, finBillCompleteDto);
+        finBillCompleteDto.setOrgSidPath(dto.getOrgPath());
         ResultBean resultBean = finBillApplicationFeign.companyToDivisionOperateQK(finBillCompleteDto);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
@@ -747,6 +751,35 @@ public class AppBusAdvanceGinvoiceapplyService {
         return rb.success().setData(resultBean.getData());
     }
 
+    public ResultBean<String> getFlowOperateTitle(AdvanceInvoiceQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        FinBillNodeQuery getNodeQuery = new FinBillNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<FinBillNodeVo>> previousNodesForReject = finBillApplicationFeign.getPreviousNodesForRejectQK(getNodeQuery);
+            if (previousNodesForReject.getSuccess()) {
+                previousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = previousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(previousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<FinBillNodeVo>> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmitQK(getNodeQuery);
+            if (nextNodesForSubmit.getSuccess()) {
+                nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = nextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(nextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
     public ResultBean<AdvanceInvoiceInfoVo> detailAdvanceInvoice(String sid) {
         ResultBean<AdvanceInvoiceInfoVo> rb = ResultBean.fireFail();
         AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo();
@@ -1200,6 +1233,35 @@ public class AppBusAdvanceGinvoiceapplyService {
         return rb.success().setData(resultBean.getData());
     }
 
+    public ResultBean<String> getFlowOperateTitleQKLP(AdvanceInvoiceQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        FinBillNodeQuery getNodeQuery = new FinBillNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<FinBillNodeVo>> previousNodesForReject = finBillApplicationFeign.getPreviousNodesForRejectQKLP(getNodeQuery);
+            if (previousNodesForReject.getSuccess()) {
+                previousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = previousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(previousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<FinBillNodeVo>> nextNodesForSubmit = finBillApplicationFeign.getNextNodesForSubmitQKLP(getNodeQuery);
+            if (nextNodesForSubmit.getSuccess()) {
+                nextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = nextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(nextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+
     public ResultBean<qkkpFlowListVo> getFlowOperateTitleByQKLP(AdvanceInvoiceQuery query) {
         ResultBean<qkkpFlowListVo> rb = ResultBean.fireFail();
         qkkpFlowListVo qkkpFlowListVo = new qkkpFlowListVo();