From c62aa50d4b53f43e4b747e09e5ed0f5aa4bd88bc Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 13 Jun 2023 09:44:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=9A=84=E6=B5=81=E7=A8=8Bid?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bussalesorder/BusSalesOrderService.java   | 45 +++++++++----------
 .../anrui/flowable/api/utils/ProcDefEnum.java |  2 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 4d0efad3d4..6747d847e1 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -4620,6 +4620,28 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+            AppOrderDetailsVo vo = resultBean.getData();
+            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
+                //更新已选择的车架号的状态为审批中
+                List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
+                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                busMainDepositUpdateQuery.setVinSidList(list);
+                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+            }
+            if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(busSalesOrderOne.getType())) {
+                List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid());
+                for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) {
+                    String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
+                    //查询该采购订单的已使用台数
+                    int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
+                    count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
+                    //更新该采购订单的锁定台数
+                    ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
+                }
+            }
             //如果创建人与部门主管一样，则自动到下一环节。
             if(busSalesOrder.get().getCreateBySid().equals(nextNodeUserSids_)){
                 busSalesOrderOne = fetchBySid(businessSid);
@@ -4635,7 +4657,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 bv.setOrgSidPath(busSalesOrderOne.getOrgSidPath());
                 bv.setComment("因与申请人相同，系统自动处理，需以下一级审批人审批意见为准！");
                 return complete(bv);
-
             }
             //极光推送
             busSalesOrder.set(fetchBySid(businessSid));
@@ -4649,28 +4670,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("销售订单");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
-            AppOrderDetailsVo vo = resultBean.getData();
-            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
-                //更新已选择的车架号的状态为审批中
-                List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
-                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
-                busMainDepositUpdateQuery.setVinSidList(list);
-                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
-                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
-                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
-            }
-            if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(busSalesOrderOne.getType())) {
-                List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid());
-                for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) {
-                    String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
-                    //查询该采购订单的已使用台数
-                    int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
-                    count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
-                    //更新该采购订单的锁定台数
-                    ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
-                }
-            }
             return voResultBean;
         }
         if (r == 2) {
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 0d010b1cb8..76b7597c5d 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -33,7 +33,7 @@ public enum ProcDefEnum {
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
-    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:9:1632516"),
+    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),