From ab7a57c2368f30a00017a87408adad0335f0ad61 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 24 Jun 2022 17:16:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E5=BA=93=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/basevehinstall/BaseVehinstallRest.java | 13 +++++++++++++ .../ScmVehicleInventoryQuery.java | 15 ++++----------- .../ScmVehicleInventoryVo.java | 11 ++--------- .../ScmVehicleStayInventoryFeign.java | 1 - .../ScmVehicleStayInventoryQuery.java | 9 --------- .../ScmVehicleStayInventoryVo.java | 11 +++-------- .../ScmVehicleInventoryService.java | 17 ++++++++++++++++- .../ScmVehicleStayInventoryMapper.java | 2 +- .../ScmVehicleStayInventoryRest.java | 4 +--- .../ScmVehicleStayInventoryService.java | 8 +++++++- 10 files changed, 47 insertions(+), 44 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java index bf4dce8cb4..5da7e54d34 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java @@ -30,6 +30,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -76,6 +77,18 @@ public class BaseVehinstallRest implements BaseVehinstallFeign { @PostMapping("/save") public ResultBean save(@RequestBody BaseVehinstallDto dto){ ResultBean rb = ResultBean.fireFail(); + String vinNo = dto.getVinNo(); + String costPrice = dto.getCostPrice(); + String guidePrice = dto.getGuidePrice(); + if (StringUtils.isBlank(vinNo)){ + return rb.setMsg("请选择主车车架号"); + } + if (StringUtils.isBlank(costPrice)){ + return rb.setMsg("请填写厂家结算价"); + } + if (StringUtils.isBlank(guidePrice)){ + return rb.setMsg("请填写销售指导价"); + } baseVehinstallService.saveOrUpdateDto(dto); return rb.success(); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryQuery.java index e9982fbe68..82d5b528c1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryQuery.java @@ -51,21 +51,14 @@ public class ScmVehicleInventoryQuery implements Query { @ApiModelProperty("车架号") private String mainSid; // 车架号 + @ApiModelProperty("盘库开始日期") + private String InventStartDate; + @ApiModelProperty("盘库结束日期") + private String InventEndDate; @ApiModelProperty("存放地点sid") private String locationSid; // 存放地点sid - @ApiModelProperty("存放地点") - private String location; // 存放地点 - @ApiModelProperty("合格证（有/无）") - private String certificate; // 合格证（有/无） - @ApiModelProperty("盘库日期") - private String InventoryDate; // 盘库日期 - @ApiModelProperty("盘库人员") - private String InventoryName; // 盘库人员 @ApiModelProperty("盘库状态 通过/未通过") private String InventoryState; // 盘库状态 通过/未通过 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 - @ApiModelProperty("使用组织") - private String useOrgName; // 使用组织 - } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java index cbb0485db4..17bcfc8e01 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryVo.java @@ -53,21 +53,14 @@ public class ScmVehicleInventoryVo implements Vo { @ApiModelProperty("车架号") private String mainSid; // 车架号 - @ApiModelProperty("存放地点sid") - private String locationSid; // 存放地点sid @ApiModelProperty("存放地点") private String location; // 存放地点 - @ApiModelProperty("合格证（有/无）") - private String certificate; // 合格证（有/无） @ApiModelProperty("盘库日期") private String InventoryDate; // 盘库日期 @ApiModelProperty("盘库人员") private String InventoryName; // 盘库人员 @ApiModelProperty("盘库状态 通过/未通过") private String InventoryState; // 盘库状态 通过/未通过 - @ApiModelProperty("创建组织") - private String createOrgSid; // 创建组织 - @ApiModelProperty("使用组织") - private String useOrgName; // 使用组织 - + @ApiModelProperty("备注") + private String remarks; // 备注 } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeign.java index 15ac4b6c96..de7dda5612 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryFeign.java @@ -87,5 +87,4 @@ public interface ScmVehicleStayInventoryFeign { @ResponseBody public ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery); - } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryQuery.java index e08986fb2a..d45f19578e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryQuery.java @@ -53,15 +53,6 @@ public class ScmVehicleStayInventoryQuery implements Query { private String mainSid; // 车架号 @ApiModelProperty("存放地点sid") private String locationSid; // 存放地点sid - @ApiModelProperty("存放地点") - private String location; // 存放地点 - @ApiModelProperty("上次盘库日期") - private String InventoryDate; // 上次盘库日期 - @ApiModelProperty("上次盘库人员") - private String InventoryName; // 上次盘库人员 @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 - @ApiModelProperty("使用组织") - private String useOrgName; // 使用组织 - } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryVo.java index 7bd25dd80b..9920ba3e75 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclestayinventory/ScmVehicleStayInventoryVo.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * Project: anrui_scm(anrui_scm)
* File: ScmVehicleStayInventoryVo.java
@@ -53,17 +55,10 @@ public class ScmVehicleStayInventoryVo implements Vo { @ApiModelProperty("车架号") private String mainSid; // 车架号 - @ApiModelProperty("存放地点sid") - private String locationSid; // 存放地点sid @ApiModelProperty("存放地点") private String location; // 存放地点 @ApiModelProperty("上次盘库日期") - private String InventoryDate; // 上次盘库日期 + private Date InventoryDate; // 上次盘库日期 @ApiModelProperty("上次盘库人员") private String InventoryName; // 上次盘库人员 - @ApiModelProperty("创建组织") - private String createOrgSid; // 创建组织 - @ApiModelProperty("使用组织") - private String useOrgName; // 使用组织 - } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index f8853953f5..de4abb4223 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -75,7 +75,22 @@ public class ScmVehicleInventoryService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmVehicleInventoryQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrg",query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getMainSid())){ + qw.like("mainSid",query.getMainSid()); + } + if (StringUtils.isNotBlank(query.getLocationSid())){ + qw.eq("locationSid",query.getLocationSid()); + } + if (StringUtils.isNotBlank(query.getInventoryState())){ + qw.eq("InventoryState",query.getInventoryState()); + } + String inventStartDate = query.getInventStartDate(); + String inventEndDate = query.getInventEndDate(); + qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (InventoryDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(inventEndDate), "date_format (InventoryDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')" + ); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java index 6728e322d8..70958a62a4 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java @@ -65,7 +65,7 @@ public interface ScmVehicleStayInventoryMapper extends BaseMapper selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from scm_vehicle_stay_inventory") + @Select("select * from scm_vehicle_stay_inventory where isDelete = 0") List selectListVo(); /** diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryRest.java index c8a3df943e..cd822ebda1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryRest.java @@ -98,9 +98,7 @@ public class ScmVehicleStayInventoryRest implements ScmVehicleStayInventoryFeign @Override public ResultBean getInventoryRecords(String userSid) { - ResultBean rb = ResultBean.fireFail(); - scmVehicleStayInventoryService.getInventoryRecords(userSid); - return rb.success(); + return scmVehicleStayInventoryService.getInventoryRecords(userSid); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java index 60b129c9f1..26566af844 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java @@ -126,8 +126,13 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService list = baseVehicleFeign.selectInventoryRecords(userSid).getData(); + List scmVehicleStayInventoryVos = baseMapper.selectListVo(); + if (scmVehicleStayInventoryVos.size() > 0){ + return rb.setMsg("盘库失败，请查看是否有未盘库的记录"); + } for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) { ScmVehicleStayInventory scmVehicleStayInventory = new ScmVehicleStayInventory(); scmVehicleStayInventory.setMainSid(appScmInventoryRecordsVo.getVin()); @@ -135,6 +140,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService