From 5f4c5a6d70dcaab8a842abc95f8dd7ee8f7a2687 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 12 Apr 2022 15:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=BD=A6=E6=9E=B6=E5=8F=B7=E5=88=97=E8=A1=A8=E5=8F=8A?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=E6=8E=92=E9=99=A4=E5=B7=B2=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=9A=84=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93=E7=9A=84=E8=BD=A6?= =?UTF-8?q?=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleReturnQuery.java | 3 ++ .../biz/basevehicle/BaseVehicleService.java | 25 ++++++++++++---- .../biz/busdeposit/BusDepositService.java | 15 ++++------ .../ScmVehicleReturnDetailsFeign.java | 28 ++++++++++++++++++ .../ScmVehicleReturnDetailsFeignFallback.java | 12 ++++++++ .../ScmVehicleReturnDetailsMapper.java | 2 ++ .../ScmVehicleReturnDetailsMapper.xml | 6 ++++ .../ScmVehicleReturnDetailsRest.java | 29 +++++++++++++++++++ .../ScmVehicleReturnDetailsService.java | 7 +++++ 9 files changed, 112 insertions(+), 15 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java index d2c30c1030..2aeb1cec85 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -36,5 +36,8 @@ public class BaseVehicleReturnQuery implements Query { @ApiModelProperty(value = "快捷检索车型") private String modelName; + @ApiModelProperty(value = "采购退库主表sid") + private String vehicleOutSid; + } 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 0975029e75..4fa41758f7 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 @@ -14,6 +14,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -66,6 +67,9 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnWrapper(BaseVehicleReturnQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { @@ -949,13 +959,18 @@ public class BaseVehicleService extends MybatisBaseService> stringList = scmVehicleReturnDetailsFeign.selectVinNoList(params.getVehicleOutSid()); + if (stringList.getSuccess()) { + if (stringList.getData().size() > 0) { + qw.notIn("bv.vinNo", stringList.getData()); + } + } + } //锁定状态 qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); - - // 虚拟订单选择车辆查询现车库存列表参数 -// if (StringUtils.isNotBlank(params.getVehicleState())) { //车辆状态 -// qw.and(wrapper -> wrapper.eq("bv.vehicleStateValue", "现车").or().eq("bv.vehicleStateValue", "库存")); -// } + qw.eq("bv.vehicleStateValue", "现车"); } return qw; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index 2316390f82..28ded49c35 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java @@ -1,21 +1,15 @@ package com.yxt.anrui.buscenter.biz.busdeposit; import com.alibaba.fastjson.JSONObject; -import com.yxt.anrui.buscenter.api.busdeposit.*; +import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; +import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; +import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; -import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; -import com.yxt.anrui.buscenter.biz.flow.FlowableService; -import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; -import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; -import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; -import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -27,7 +21,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.ListenableFutureCallback; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * Project: anrui-buscenter(车辆订单)
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java new file mode 100644 index 0000000000..03ccf0cbf5 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.scm.api.scmvehiclereturndetails; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/12 15:30 + * @Description + */ +@FeignClient( + contextId = "anrui-scm-ScmVehicleReturnDetails", + name = "anrui-scm", + path = "v1/scmvehiclereturndetails", + fallback = ScmVehicleReturnDetailsFeignFallback.class) +public interface ScmVehicleReturnDetailsFeign { + + @ApiOperation("查询车架号列表") + @GetMapping("/selectVinNoList") + @ResponseBody + ResultBean> selectVinNoList(@PathVariable(value = "sid") String sid); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java new file mode 100644 index 0000000000..a67f7d67be --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.scm.api.scmvehiclereturndetails; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/4/12 15:30 + * @Description + */ +@Component +public class ScmVehicleReturnDetailsFeignFallback { +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java index b2cb92df42..dd10097645 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java @@ -28,4 +28,6 @@ public interface ScmVehicleReturnDetailsMapper extends BaseMapper selectVinNoList(String sid); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml index 46c7b283de..bab35954ce 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml @@ -12,4 +12,10 @@ from scm_vehicle_return_details where vehicleOutSid = #{sid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java new file mode 100644 index 0000000000..e8f80e4e2e --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.scm.biz.scmvehiclereturndetails; + +import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/12 15:29 + * @Description + */ +@Api(tags = "车辆采购退库详细管理") +@RequestMapping("v1/scmvehiclereturndetails") +@Controller +public class ScmVehicleReturnDetailsRest implements ScmVehicleReturnDetailsFeign { + + @Autowired + private ScmVehicleReturnDetailsService scmVehicleReturnDetailsService; + + @Override + public ResultBean> selectVinNoList(String sid) { + return scmVehicleReturnDetailsService.selectVinNoList(sid); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java index 0e0ad9f583..d2b865828f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.scm.biz.scmvehiclereturndetails; import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails; import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsDto; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,4 +55,10 @@ public class ScmVehicleReturnDetailsService extends MybatisBaseService> selectVinNoList(String sid) { + ResultBean> rb = ResultBean.fireFail(); + List vinNoList = baseMapper.selectVinNoList(sid); + return rb.success().setData(vinNoList); + } }