From 78f8cc1875d6125d69d71f9730ccee1a6212fc81 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 1 Feb 2023 18:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplication.java | 2 - .../api/basetrailer/BaseTrailerFeign.java | 6 ++ .../api/basevehicle/BaseVehicleFeign.java | 7 ++ .../basevehicle/BaseVehicleFeignFallback.java | 5 ++ .../BaseOutsourcingApplicationService.java | 13 ++-- .../biz/basetrailer/BaseTrailerMapper.java | 2 + .../biz/basetrailer/BaseTrailerMapper.xml | 8 +++ .../base/biz/basetrailer/BaseTrailerRest.java | 5 ++ .../biz/basetrailer/BaseTrailerService.java | 40 ++++++++++-- .../base/biz/basevehicle/BaseVehicleRest.java | 7 +- .../biz/basevehicle/BaseVehicleService.java | 65 ++++++++++++++----- .../basevehicleout/BaseVehicleOutMapper.java | 2 + .../basevehicleout/BaseVehicleOutMapper.xml | 8 +++ .../basevehicleout/BaseVehicleOutService.java | 9 ++- .../basevehinstall/BaseVehinstallRest.java | 2 +- 15 files changed, 149 insertions(+), 32 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java index 3ad5a46bfb..7232fb438e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java @@ -52,8 +52,6 @@ import java.math.BigDecimal; public class BaseOutsourcingApplication extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("外采申请单sid") - private String sid; // 外采申请单sid @ApiModelProperty(value = "车辆型号") private String vehMark; @ApiModelProperty("申请编号") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index 83a211e9b8..9cd900264f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.api.basetrailer; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -111,4 +112,9 @@ public interface BaseTrailerFeign { @ApiOperation("挂车检索分页列表") @PostMapping("/searchPage") ResultBean> searchPage(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("挂车出库") + @PostMapping("/trailerOut") + @ResponseBody + public ResultBean trailerOut(@RequestBody BaseTrailerDto dto); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 1b7d01007d..c1b7d2f589 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -257,6 +257,13 @@ public interface BaseVehicleFeign { @PostMapping("/selExistingCar") public ResultBean> selExistingCar(@RequestParam("createOrgSid") String createOrgSid); + /** + * 按照库存状态获取车辆信息 + */ + @ApiOperation("按照库存状态获取车辆信息") + @PostMapping("/selVehByStockState") + public ResultBean> selVehByStockState(@RequestParam("createOrgSid") String createOrgSid); + /** * pc排产车详情（新） * diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 51c4cf3dd8..0b49784cfd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -147,6 +147,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> selVehByStockState(String createOrgSid) { + return null; + } + @Override public ResultBean getPurchaseDetails(String vinNo) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 90b9de4533..33510e3547 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -26,6 +26,7 @@ package com.yxt.anrui.base.biz.baseoutsourcingapplication; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -184,10 +185,8 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos(); CommonAppendix contract = dto.getContract(); - String sid1 = entity.getSid(); String sid = dto.getSid(); BigDecimal guidedPrice = dto.getGuidedPrice(); BigDecimal purchasePrice = dto.getPurchasePrice(); @@ -198,12 +197,12 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService> sysStaffOrgListByStaffSid = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid); List data = sysStaffOrgListByStaffSid.getData(); @@ -245,7 +244,7 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService { @Select("select * from base_trailer where vehSid = #{sid}") BaseTrailerDetailsVo fetchByVehSid(String sid); + + String selectNum(String billNo); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml index 5582502e37..5da25be706 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml @@ -55,4 +55,12 @@ FROM base_trailer bt ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java index bdbb9fbc35..4367e6aae1 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java @@ -104,4 +104,9 @@ public class BaseTrailerRest implements BaseTrailerFeign { PagerVo pv1 = PagerUtil.pageToVo(page, pv); return rb.success().setData(pv1); } + + @Override + public ResultBean trailerOut(BaseTrailerDto dto) { + return baseTrailerService.trailerOut(dto); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index d4de0e84ac..f495e8f19b 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java @@ -38,6 +38,8 @@ import com.yxt.anrui.base.api.basetrailermodel.BaseTrailerModelDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOut; +import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; @@ -47,8 +49,10 @@ import com.yxt.anrui.base.biz.basetrailermodel.BaseTrailerModelService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; +import com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutService; import com.yxt.anrui.base.biz.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; @@ -113,6 +117,8 @@ public class BaseTrailerService extends MybatisBaseService createQueryWrapper(BaseTrailerQuery query) { // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -145,7 +151,7 @@ public class BaseTrailerService extends MybatisBaseService pagging = baseMapper.selectPageVo(page, qw); for (BaseTrailerVo record : pagging.getRecords()) { String trailerModelSid = record.getTrailerModelSid(); - if (StringUtils.isNotBlank(trailerModelSid)){ + if (StringUtils.isNotBlank(trailerModelSid)) { BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(trailerModelSid); String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong(); String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide(); @@ -270,19 +276,19 @@ public class BaseTrailerService extends MybatisBaseService sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()); - if (data1 != null){ + if (data1 != null) { //采购组织:FPurchaseOrgId (必填项) stkInStock.setFPurchaseOrgId(data1.getOrgCode()); //分配目标组织:TOrgId (必填项) stkInStock.setTOrgId(data1.getOrgCode()); - }else { + } else { SysOrganizationVo vo = sysOrganizationVoResultBean.getData(); if (vo != null) { //采购组织:FPurchaseOrgId (必填项) @@ -399,4 +405,30 @@ public class BaseTrailerService extends MybatisBaseService> selVehByStockState(String createOrgSid) { + return baseVehicleService.selVehByStockState(createOrgSid); + } + /** * 根据车架号查询现车详情 * 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 07f2a88cd1..2a3d8dc679 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 @@ -1121,13 +1121,13 @@ public class BaseVehicleService extends MybatisBaseService getVins(String modelSid, String configSid, String userSid, String orgPath,String name) { + public List getVins(String modelSid, String configSid, String userSid, String orgPath, String name) { if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); } else { orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } - List vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath,name); + List vins = baseMapper.getVins(modelSid, configSid, VehicleState.LockEnum.UN_LOCK.getCode(), orgPath, name); if (vins.size() <= 0) { for (AppVinsDetailsVo vin : vins) { vins.add(vin); @@ -1781,10 +1781,10 @@ public class BaseVehicleService extends MybatisBaseService vehicleActualWrapper(BaseChoiceVehicleQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { - if(StringUtils.isNotBlank(params.getOrgPath())){ + if (StringUtils.isNotBlank(params.getOrgPath())) { String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); qw.eq("bv.createOrgSid", orgSid); - }else{ + } else { //本分公司 if (StringUtils.isNotBlank(params.getUserSid())) { String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); @@ -2165,14 +2165,47 @@ public class BaseVehicleService extends MybatisBaseService> selVehByStockState(String createOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List stringList = baseVehinstallService.selectListVo(createOrgSid); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("bv.createOrgSid", createOrgSid); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", "0001").or().eq("bv.vehicleState", "0002")); + if (stringList.size() > 0) { + qw.notIn("bv.vinNo", stringList); + } + List baseExistingCarListVo = baseMapper.selExistingCar(qw); + for (BaseExistingCarListVo existingCarListVo : baseExistingCarListVo) { + List busSalesOrderVehicles = busSalesOrderVehicleFeign.fetchByVehSid(existingCarListVo.getVehSid()).getData(); + for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { + String salesOrderSid = busSalesOrderVehicle.getSalesOrderSid(); + BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.fetchDetailsBySid(salesOrderSid).getData(); + if (busSalesOrderDetailsVo != null) { + if (!busSalesOrderDetailsVo.getNodeState().equals("待提交") && !busSalesOrderDetailsVo.getNodeState().equals("已终止")) { + existingCarListVo.setSaleOrderNo(busSalesOrderDetailsVo.getBillNo()); + existingCarListVo.setSaleOrderDate(busSalesOrderDetailsVo.getCreateDate()); + existingCarListVo.setCustomerSid(busSalesOrderDetailsVo.getCustomerSid()); + existingCarListVo.setCustomerName(busSalesOrderDetailsVo.getCustomerName()); + existingCarListVo.setStaffSid(busSalesOrderDetailsVo.getStaffSid()); + existingCarListVo.setStaffName(busSalesOrderDetailsVo.getStaffName()); + break; + } } } } @@ -2190,10 +2223,10 @@ public class BaseVehicleService extends MybatisBaseService qw = new QueryWrapper<>(); if (query != null) { - if(StringUtils.isNotBlank(query.getOrgPath())){ + if (StringUtils.isNotBlank(query.getOrgPath())) { ResultBean resultBean = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()); qw.eq("bv.useOrgSid", resultBean.getData()); - }else{ + } else { if (StringUtils.isNotBlank(query.getUserSid())) { ResultBean resultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()); qw.eq("bv.useOrgSid", resultBean.getData()); @@ -2256,10 +2289,10 @@ public class BaseVehicleService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = new QueryWrapper(); VinByWarehouseQuery params = pagerQuery.getParams(); - if(StringUtils.isNotBlank(params.getOrgPath())){ + if (StringUtils.isNotBlank(params.getOrgPath())) { String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); params.setUseOrgSid(useOrgSid); - }else{ + } else { String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); params.setUseOrgSid(useOrgSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java index 36768d6eb6..129f37e28a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java @@ -36,4 +36,6 @@ public interface BaseVehicleOutMapper extends BaseMapper { @Select("select * from base_vehicle_out where mainSid = #{xsckdSid}") List fetchByMainSid(String xsckdSid); + + BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml index 6b871db292..5a2b886b35 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml @@ -104,4 +104,12 @@ order by id desc limit 1 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index cbb9c5bb59..eb3aa53f97 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -249,10 +249,13 @@ public class BaseVehicleOutService extends MybatisBaseService