From 6dfa5d7e94b959d24a5a98187c90f1a9cd04cc62 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Sat, 9 Apr 2022 15:29:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=9C=AA=E5=94=AE=E4=B9=B0?= =?UTF-8?q?=E6=96=AD=E8=BD=A6=E8=BE=86=E5=88=97=E8=A1=A8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E3=80=81=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleActualDetailsVo.java | 27 ++++++++++++++ .../ScmVehicleActualSalesDetailsVo.java | 29 +++++++++++++++ .../ScmVehicleActualSalesFeign.java | 12 ++++--- .../ScmVehicleActualSalesFeignFallback.java | 7 +++- .../ScmVehicleActualDetailsMapper.java | 11 +++++- .../ScmVehicleActualDetailsMapper.xml | 6 ++++ .../ScmVehicleActualDetailsService.java | 11 ++++++ .../ScmVehicleActualSalesMapper.java | 11 +++++- .../ScmVehicleActualSalesMapper.xml | 8 ++++- .../ScmVehicleActualSalesRest.java | 11 +++--- .../ScmVehicleActualSalesService.java | 36 ++++++++++++++----- 11 files changed, 148 insertions(+), 21 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesDetailsVo.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java new file mode 100644 index 0000000000..3816086e2e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualdetails/ScmVehicleActualDetailsVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.scm.api.scmvehicleactualdetails; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2022/4/9 11:35 + * @Description 未售买断已选择的车辆列表 + */ +@Data +public class ScmVehicleActualDetailsVo implements Vo { + private static final long serialVersionUID = -281646013506665817L; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty(value = "入库日期") + private Date inboundDate; + @ApiModelProperty(value = "入库价") + private String inboundPrice; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesDetailsVo.java new file mode 100644 index 0000000000..304592ec7b --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesDetailsVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.scm.api.scmvehicleactualsales; + +import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/9 11:28 + * @Description + */ +@Data +public class ScmVehicleActualSalesDetailsVo implements Vo { + private static final long serialVersionUID = -3110309934818922020L; + @ApiModelProperty(value = "未售买断sid") + private String sid; + @ApiModelProperty(value = "申请人") + private String applicationName; + @ApiModelProperty(value = "申请日期") + private String createTime; + @ApiModelProperty(value = "买断原因") + private String reason; + @ApiModelProperty(value = "车辆列表") + private List voList = new ArrayList<>(); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java index ead43c460e..7b63fb8f14 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeign.java @@ -5,14 +5,12 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * @Author dimengzhe * @Date 2022/4/8 11:57 - * @Description + * @Description 未售买断管理 */ @FeignClient( contextId = "anrui-scm-ScmVehicleActualSales", @@ -36,5 +34,11 @@ public interface ScmVehicleActualSalesFeign { @ResponseBody ResultBean submitVehicleSales(@RequestBody ScmVehicleActualSalesDto scmVehicleActualSalesDto); + @ApiOperation("初始化") + @GetMapping("/details") + @ResponseBody + ResultBean details(@RequestParam(value = "sid") String sid, + @RequestParam(value = "name") String name); + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java index 42699cae0d..743fe8c4fc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleactualsales/ScmVehicleActualSalesFeignFallback.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * @Description */ @Component -public class ScmVehicleActualSalesFeignFallback implements ScmVehicleActualSalesFeign{ +public class ScmVehicleActualSalesFeignFallback implements ScmVehicleActualSalesFeign { @Override public ResultBean> listPage(PagerQuery pagerQuery) { return null; @@ -26,4 +26,9 @@ public class ScmVehicleActualSalesFeignFallback implements ScmVehicleActualSales public ResultBean submitVehicleSales(ScmVehicleActualSalesDto scmVehicleActualSalesDto) { return null; } + + @Override + public ResultBean details(String sid, String name) { + return null; + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.java index 5b9b4117ae..0e68ba727f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.java @@ -2,6 +2,7 @@ package com.yxt.anrui.scm.biz.scmvehicleactualdetails; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetails; +import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -13,8 +14,16 @@ import java.util.List; */ @Mapper public interface ScmVehicleActualDetailsMapper extends BaseMapper { - + List selectBySaleSid(String sid); int deleteBySaleSid(String sid); + + /** + * 已选择的车辆列表 + * + * @param sid 未售买断sid + * @return + */ + List detailsList(String sid); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.xml index e734d383f2..3d56310685 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsMapper.xml @@ -12,4 +12,10 @@ from scm_vehicle_actual_details where vehicleActualSid = #{sid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsService.java index ef27f436e8..4b59e063e0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualdetails/ScmVehicleActualDetailsService.java @@ -2,6 +2,7 @@ package com.yxt.anrui.scm.biz.scmvehicleactualdetails; import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetails; import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsDto; +import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -55,4 +56,14 @@ public class ScmVehicleActualDetailsService extends MybatisBaseService detailsList(String sid) { + return baseMapper.detailsList(sid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.java index 43cb19bee0..3a20c14f94 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSales; +import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesDetailsVo; import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +24,13 @@ public interface ScmVehicleActualSalesMapper extends BaseMapper pagerList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage pagerList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 初始化 + * + * @param sid 车辆未售买断sid + * @return + */ + ScmVehicleActualSalesDetailsVo details(String sid); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.xml index 3e1e15f388..e574ccf29d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesMapper.xml @@ -4,10 +4,16 @@ + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java index 82e09cef9e..5b9eedb884 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesRest.java @@ -1,9 +1,6 @@ package com.yxt.anrui.scm.biz.scmvehicleactualsales; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesDto; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesFeign; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesQuery; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesVo; +import com.yxt.anrui.scm.api.scmvehicleactualsales.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -25,7 +22,6 @@ public class ScmVehicleActualSalesRest implements ScmVehicleActualSalesFeign { @Autowired private ScmVehicleActualSalesService scmVehicleActualSalesService; - @Override public ResultBean> listPage(PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); @@ -42,4 +38,9 @@ public class ScmVehicleActualSalesRest implements ScmVehicleActualSalesFeign { public ResultBean submitVehicleSales(ScmVehicleActualSalesDto scmVehicleActualSalesDto) { return scmVehicleActualSalesService.submitVehicleSales(scmVehicleActualSalesDto); } + + @Override + public ResultBean details(String sid, String name) { + return scmVehicleActualSalesService.details(sid, name); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java index 136159a3c5..59e3fa6e41 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleactualsales/ScmVehicleActualSalesService.java @@ -1,5 +1,6 @@ package com.yxt.anrui.scm.biz.scmvehicleactualsales; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; @@ -7,10 +8,8 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetails; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSales; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesDto; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesQuery; -import com.yxt.anrui.scm.api.scmvehicleactualsales.ScmVehicleActualSalesVo; +import com.yxt.anrui.scm.api.scmvehicleactualdetails.ScmVehicleActualDetailsVo; +import com.yxt.anrui.scm.api.scmvehicleactualsales.*; import com.yxt.anrui.scm.biz.scmvehicleactualdetails.ScmVehicleActualDetailsService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -70,13 +69,13 @@ public class ScmVehicleActualSalesService extends MybatisBaseService pagerList(PagerQuery pagerQuery) { - IPage page = PagerUtil.queryToPage(pagerQuery); - QueryWrapper qw = buildQueryWrapper(pagerQuery.getParams()); + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = buildQueryWrapper(pagerQuery.getParams()); return baseMapper.pagerList(page, qw); } - private QueryWrapper buildQueryWrapper(ScmVehicleActualSalesQuery params) { - QueryWrapper qw = new QueryWrapper<>(); + private QueryWrapper buildQueryWrapper(ScmVehicleActualSalesQuery params) { + QueryWrapper qw = new QueryWrapper<>(); if (params != null) { //申请日期 //状态 @@ -152,4 +151,25 @@ public class ScmVehicleActualSalesService extends MybatisBaseService details(String sid, String name) { + ResultBean rb = ResultBean.fireFail(); + ScmVehicleActualSales scmVehicleActualSales = fetchBySid(sid); + ScmVehicleActualSalesDetailsVo vo = new ScmVehicleActualSalesDetailsVo(); + if (scmVehicleActualSales == null) { + //申请日期即为当天 + vo.setCreateTime(DateUtil.today()); + vo.setApplicationName(name); + } else { + vo = baseMapper.details(sid); + List voList = scmVehicleActualDetailsService.detailsList(sid); + } + return rb.success().setData(vo); + } }