From 442423eda874eae77a89d6f984f5e02280b38e9d Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 2 Aug 2022 19:39:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=B7=BB=E5=8A=A0=E5=87=BA?=
 =?UTF-8?q?=E9=97=A8=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/base/biz/basevehicle/BaseVehicleService.java    | 7 ++-----
 .../biz/scmvehiclegression/ScmVehicleGressionService.java | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index eb589534d5..b42e1325c8 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -3,7 +3,6 @@ package com.yxt.anrui.base.biz.basevehicle;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.nacos.api.config.filter.IFilterConfig;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
@@ -14,12 +13,10 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
-import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService;
-import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.biz.basevehinstall.BaseVehinstallService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
@@ -28,12 +25,10 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery;
-import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 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.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -1637,6 +1632,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(params.getUseOrgSid())) {
             qw.eq("bv.createOrgSid", params.getUseOrgSid());
         }
+        qw.eq("bv.vehicleState",VehicleState.StockEnum.STOCK.getCode());
+        qw.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.WITPURCHASE));
         IPage<AppScmWarehouseVinVo> iPage = baseMapper.getPcVinByWarehouseSid(page, qw, params.getWarehouseSid());
         return iPage;
     }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index bfe832d212..9acb333fef 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -312,14 +312,14 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         String userSid = dto.getUserSid();
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
-        String vehicleSid = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData().getSid();
+//        String vehicleSid = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData().getSid();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         ScmVehicleGression scmVehicleGression = null;
         if (StringUtils.isBlank(dto.getSid())) {
             scmVehicleGression = new ScmVehicleGression();
             BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
             scmVehicleGression.setHandleState("1");
-            scmVehicleGression.setVehicleSid(vehicleSid);
+            scmVehicleGression.setVehicleSid(dto.getVehicleSid());
             scmVehicleGression.setApplicantName(data.getStaffName());
             scmVehicleGression.setApplicantDate(simpleDateFormat.format(new Date()));
             scmVehicleGression.setOrgSid(data.getOrgSid());
@@ -702,12 +702,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 vehicleGression.setLocation(scmVehicleGression.getTargetLocationSid());
                 vehicleGression.setLocationName(scmVehicleGression.getTargetLocation());
                 baseVehicleFeign.updateVehicleGressionByVin(vehicleGression);
-                String pdfPath = createPdf(bv.getBusinessSid());
+               /* String pdfPath = createPdf(bv.getBusinessSid());
                 //将生成的出门证添加到出门证表中
                 ScmExitPermit scmExitPermit = new ScmExitPermit();
                 scmExitPermit.setLinkSid(bv.getBusinessSid());
                 scmExitPermit.setUrl(pdfPath);
-                scmExitPermitService.insert(scmExitPermit);
+                scmExitPermitService.insert(scmExitPermit);*/
             }
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             return rb.success().setData(resultBean.getData());