From 73581abb36d5252fd21be4b81a702ac46a0e56e0 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 12 Aug 2022 10:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=99=9A=E6=8B=9F=E8=AE=A2=E5=8D=95=E4=B8=BA=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=8A=B6=E6=80=81=E5=B7=B2=E5=8A=9E=E7=BB=93=E7=9A=84?=
 =?UTF-8?q?+=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=92=E4=BA=A7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=E9=87=87=E8=B4=AD=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java | 3 +++
 .../anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml  | 3 ++-
 .../buscenter/biz/busmaindeposit/BusMainDepositService.java   | 4 +++-
 .../biz/bussalesorderdeposit/BusSalesOrderDepositService.java | 4 +++-
 .../terminal/api/supplychain/vehicleApply/VehicleApplyVo.java | 2 ++
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java
index 976fc4d5da..1e700b32c1 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java
@@ -43,4 +43,7 @@ public class AppVehicleApplyVo implements Vo {
 
     @ApiModelProperty(value = "排产列表")
     private List<AppVehicleApplyListVo> records = new ArrayList<>();
+
+    @ApiModelProperty(value = "采购类型")
+    private String applyType;
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
index 67f0f0a099..56107573c1 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml
@@ -72,7 +72,8 @@
                ba.procInstId,
                ba.taskId,
                ba.createOrgSid as userSid,
-               ba.createOrgName
+               ba.createOrgName,
+               ba.applyType
         from bus_vehicle_apply ba
         where sid = #{sid}
     </select>
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 90b93d361f..5b56d60fa9 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -57,6 +57,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
@@ -1667,7 +1668,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         }
         qw.eq("bc.customerSid", query.getCustomerSid());
         qw.eq("bd.depositBillTypeKey", "02");
-        qw.eq("bd.state", 1);
+//        qw.eq("bd.state", 1);
+        qw.eq("bd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         return qw;
     }
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
index 904ccb6cb1..cbb22d2be0 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
@@ -42,6 +42,7 @@ import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -259,7 +260,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                 }
             }
         }
-        qw.eq("bd.state", 1);
+//        qw.eq("bd.state", 1);
+        qw.eq("bd.nodeState", FlowComment.SETTLE.getRemark());//已办结
         qw.eq("bmd.depositBillTypeKey", "01");
         return qw;
     }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java
index aed705d56d..316c7f27f3 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java
@@ -48,6 +48,8 @@ public class VehicleApplyVo implements Vo {
 
     @ApiModelProperty(value = "用户sid")
     private String userSid;
+    @JsonProperty("type")
+    private String applyType;
 
 
 }