Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@@ -228,5 +228,9 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyListQk(@RequestBody PagerQuery<AppDeliveredApplyPageQuery> pagerQuery);
 
+    @ApiOperation(value = "欠款出库加签")
+    @PostMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody DeliveredDelegateQuery deliveredDelegateQuery);
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@@ -186,6 +186,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return null;
     }
 
+    @Override
+    public ResultBean delegate(DeliveredDelegateQuery deliveredDelegateQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean complete(BusDeliveredApplyCompleteDto query) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredDelegateQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/10/12
+ **/
+@Data
+public class DeliveredDelegateQuery {
+
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+//    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.java

@@ -75,4 +75,6 @@ public interface BusBillApplicationMapper extends BaseMapper<BusBillApplication>
 
     @Select("select * from bus_bill_application where ckSid = #{sid}")
     BusBillApplication selectByCkSidAll(String sid);
+
+    BusBillApplication selectByContractNoAndSid(@Param("contractNo") String contractNo, @Param("vinSid") String vinSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationMapper.xml

@@ -91,4 +91,11 @@
         where qkkpBillNo = #{qkkpBillNo}
         ORDER BY createTime DESC LIMIT 1
     </select>
+
+    <select id="selectByContractNoAndSid"
+            resultType="com.yxt.anrui.buscenter.api.busbillapplication.BusBillApplication">
+        select ba.* from bus_bill_application ba
+        left join bus_bill_vehicle bvv on ba.sid = bvv.billAppSid
+        where ba.contractNo = #{contractNo} and bvv.vehSid = #{vinSid} order by id desc limit 1
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@@ -458,4 +458,8 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
     public BusBillApplication selectByCkSidAll(String sid) {
         return baseMapper.selectByCkSidAll(sid);
     }
+
+    public BusBillApplication selectByContractNoAndSid(String contractNo, String vinSid) {
+        return baseMapper.selectByContractNoAndSid(contractNo,vinSid);
+    }
 }

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

@@ -257,6 +257,11 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean delegate(DeliveredDelegateQuery deliveredDelegateQuery) {
+        return busDeliveredApplyService.delegate(deliveredDelegateQuery);
+    }
+
     @Override
     public ResultBean complete(BusDeliveredApplyCompleteDto query) {
         BusinessVariables bv = new BusinessVariables();

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

@@ -125,6 +125,7 @@ import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
@@ -1283,11 +1284,30 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                         log.error("获取销售订单详情出错啦！！！");
                     }
                     ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
-
-                    //推送开票申请数据
+                    //判断是否是高低开，高低开的话推送开票申请
+                    detailsList.removeAll(Collections.singleton(null));
+                    BusSalesOrderPrice data = busSalesOrderService.selectByContractNoOne(busDeliveredApply.getContractNo()).getData();
+                    if(!detailsList.isEmpty()){
+                        for (int i = 0; i < detailsList.size(); i++) {
+                            List<BusDeliveredApplyDetails> detailsList2 = new ArrayList<>();
+                            BusDeliveredApplyDetails busDeliveredApplyDetails = detailsList.get(i);
+                            //根据合同和车辆sid获取欠款开票的信息
+                            BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(),busDeliveredApplyDetails.getVinSid());
+                            if(busBillApplication != null){
+                                if(!data.getSingleFinalPrice().equals(busBillApplication.getOneBillMoney())){
+                                    detailsList2.add(busDeliveredApplyDetails);
+                                    //推送开票申请数据
+                                    Future future1 = pool.submit(() -> {
+                                        pushInvoice2(busDeliveredApply, detailsList2, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
+                                    });
+                                }
+                            }
+                        }
+                    }
+                  /*  //推送开票申请数据
                     Future future1 = pool.submit(() -> {
                         pushInvoice2(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
-                    });
+                    });*/
 
                     //推送优惠包交接数据
                     Future future2 = pool.submit(() -> {
@@ -4594,4 +4614,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         PagerVo<AppDeliveredApplyPageVo> p = PagerUtil.pageToVo(iPage, null);
         return p;
     }
+
+    public ResultBean delegate(DeliveredDelegateQuery deliveredDelegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
+        BeanUtil.copyProperties(deliveredDelegateQuery, delegateQuery);
+        flowFeign.delegate(delegateQuery);
+        return rb.success();
+    }
 }

anrui-buscenter/anrui-buscenter-ui/src/api/tesheshenpi/debtrelease.js

@@ -107,7 +107,7 @@ export function revokeProcess(data) {
 // 代办任务加签任务
 export function delegate(data) {
   return request({
-    url: '/flowable/v2/flow/delegate',
+    url: '/buscenter/v1/busdeliveredapply/delegate',
     method: 'post',
     data: data,
     headers: {

anrui-reportcenter-ui/public/index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <title><%= webpackConfig.name %></title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -208,4 +208,9 @@ public interface AppBusDeliveredApplyFeign {
     @ResponseBody
     ResultBean<String> getFlowOperateTitleQk(@Valid @SpringQueryMap RetrievalQuery query);
 
+    @ApiOperation(value = "欠款出库加签")
+    @PutMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody DeliveredApplyDelegateQuery deliveredApplyDelegateQuery);
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@@ -196,4 +196,9 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
     public ResultBean<String> getFlowOperateTitleQk(RetrievalQuery query) {
         return null;
     }
+
+    @Override
+    public ResultBean delegate(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/DeliveredApplyDelegateQuery.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.terminal.api.autoservice.retrieval.flowable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/10/12
+ **/
+@Data
+public class DeliveredApplyDelegateQuery {
+
+    @ApiModelProperty
+    private String userSid;
+    @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
+    private String instanceId;
+    @ApiModelProperty("任务Id")
+    private String taskId;
+    @ApiModelProperty("审批人sid")
+    private String assignee;
+    @ApiModelProperty("填写意见")
+    private String views;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@@ -205,4 +205,9 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
     public ResultBean<String> getFlowOperateTitleQk(RetrievalQuery query) {
         return appBusDeliveredApplyService.getFlowOperateTitleQk(query);
     }
+
+    @Override
+    public ResultBean delegate(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) {
+        return appBusDeliveredApplyService.delegate(deliveredApplyDelegateQuery);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@@ -893,4 +893,12 @@ public class AppBusDeliveredApplyService {
         }
         return rb.success().setData(data);
     }
+
+    public ResultBean delegate(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        DeliveredDelegateQuery deliveredDelegateQuery = new DeliveredDelegateQuery();
+        BeanUtil.copyProperties(deliveredApplyDelegateQuery,deliveredDelegateQuery);
+        ResultBean resultBean = busDeliveredApplyFeign.delegate(deliveredDelegateQuery);
+        return resultBean;
+    }
 }