From 25ff339c5809108e16162dab4059b4ee7c5c3794 Mon Sep 17 00:00:00 2001 From: hanlinghao <2969694837@qq.com> Date: Wed, 29 Jun 2022 12:20:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E5=BA=93=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmVehicleExamineFeign.java | 4 + .../ScmVehicleExamineFeignFallback.java | 5 + .../ScmVehicleExaminePageQuery.java | 69 ++++ .../ScmVehicleExaminePageVo.java | 77 ++++ ...AppScmVehicleStayInventoryDetailedsVo.java | 2 + .../ScmVehicleInventory.java | 24 +- .../ScmVehicleExamineMapper.java | 2 + .../ScmVehicleExamineMapper.xml | 18 + .../ScmVehicleExamineRest.java | 13 + .../ScmVehicleExamineService.java | 41 +++ .../ScmVehicleInventoryMapper.java | 70 ++-- .../ScmVehicleInventoryMapper.xml | 37 +- .../ScmVehicleInventoryRest.java | 129 ++++--- .../ScmVehicleInventoryService.java | 334 ++++++++++-------- .../ScmVehicleStayInventoryService.java | 22 +- .../inventory/StayInventoryDto.java | 12 + .../AppScmVehicleInventoryService.java | 6 + 17 files changed, 576 insertions(+), 289 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java index a158884b63..34cc9f2047 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeign.java @@ -74,6 +74,10 @@ public interface ScmVehicleExamineFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("PC端-获取验车管理列表") + @PostMapping("/selectCarInspectedList") + @ResponseBody + public ResultBean> selectCarInspectedList(@RequestBody PagerQuery pagerQuery); @ApiOperation("手机端-获取验车管理列表") @PostMapping("/getCarInspectedList") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java index 91c6e22794..ac8e2eb089 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExamineFeignFallback.java @@ -68,6 +68,11 @@ public class ScmVehicleExamineFeignFallback implements ScmVehicleExamineFeign { return rb.setMsg("接口scm/scmvehicleexamine/fetchDetailsBySid无法访问"); } + @Override + public ResultBean> selectCarInspectedList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> getCarInspectedList(PagerQuery pagerQuery) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java new file mode 100644 index 0000000000..cfb5e11e26 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageQuery.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineQuery.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineQuery
+ * Description: 验车单 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单 查询条件", description = "验车单 查询条件") +public class ScmVehicleExaminePageQuery implements Query { + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("类型 “ ” 或 null 全部 1待验车 2已验车") + private String type; + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("订单类型（外采，内购，排产）") + private String purchaseType; + + @ApiModelProperty("使用组织分公司sid") + private String useOrgSid; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java new file mode 100644 index 0000000000..1b60b7a6b3 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleexamine/ScmVehicleExaminePageVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehicleexamine; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: scm(scm)
+ * File: ScmVehicleExamineVo.java
+ * Class: scm.api.scmvehicleexamine.ScmVehicleExamineVo
+ * Description: 验车单 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-06 09:53:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "验车单 视图数据对象", description = "验车单 视图数据对象") +public class ScmVehicleExaminePageVo implements Vo { + + private String inspectedSid; + + @ApiModelProperty("车型") + private String model; + + @ApiModelProperty("车架号") + private String vin; + + @ApiModelProperty("发车日期") + private String dispatchedDate; + + @ApiModelProperty("采购订单类型（外采，内购，排产）") + private String purchaseType; + + @ApiModelProperty("验车人") + private String inspectedName; + + @ApiModelProperty("验车日期") + private String inspectedDate; + + @ApiModelProperty("验车按钮 显示 只要通过了就不显示") + private boolean showInspectedBtn; + + @ApiModelProperty("是否验车 未验车 1 以验车2") + private String inspectedType; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java index 2ceae8e7ca..82f1867e0a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDetailedsVo.java @@ -48,6 +48,8 @@ import lombok.Data; @ApiModel(value = "待盘库记录 视图数据对象", description = "待盘库记录 视图数据对象") public class AppScmVehicleStayInventoryDetailedsVo implements Vo { + private String id; + @ApiModelProperty("车架号") private String vin; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventory.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventory.java index b297f584f8..a2e2b07f54 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventory.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventory.java @@ -50,25 +50,31 @@ import lombok.Data; public class ScmVehicleInventory extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String mainSid; // 车架号 - @ApiModelProperty("存放地点sid") + @ApiModelProperty("存放地点sid") private String locationSid; // 存放地点sid - @ApiModelProperty("存放地点") + @ApiModelProperty("存放地点") private String location; // 存放地点 - @ApiModelProperty("合格证（有/无）") + @ApiModelProperty("合格证（有/无）") private String certificate; // 合格证（有/无） - @ApiModelProperty("盘库日期") + @ApiModelProperty("合格证（有 1 /无 0）") + private String certificateKey; + @ApiModelProperty("盘库日期") private String InventoryDate; // 盘库日期 - @ApiModelProperty("盘库人员") + @ApiModelProperty("盘库人员") private String InventoryName; // 盘库人员 @ApiModelProperty("盘库人员sid") private String InventorySid; // 盘库人员sid - @ApiModelProperty("盘库状态 通过/未通过") + @ApiModelProperty("盘库状态 通过/未通过") private String InventoryState; // 盘库状态 通过/未通过 - @ApiModelProperty("创建组织") + @ApiModelProperty("盘库状态 通过 1 /未通过 2") + private String InventoryStateKey; + @ApiModelProperty("创建组织") private String createOrgSid; // 创建组织 - @ApiModelProperty("使用组织") + @ApiModelProperty("使用组织") private String useOrgName; // 使用组织 + @ApiModelProperty("备注") + private String remarks; // 使用组织 } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java index bffa3d6962..43ab8aabde 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java @@ -92,4 +92,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper { * @return */ AppScmVehicleExamineDetailsVo getCarInspected(@Param("inspectedSid") String inspectedSid); + + IPage selectCarInspectedList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml index 4f889e3a76..472811f744 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml @@ -66,4 +66,22 @@ FROM scm_vehicle_examine sve WHERE sve.sid = #{inspectedSid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java index a600e9c7bf..91fbd9075a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineRest.java @@ -95,6 +95,19 @@ public class ScmVehicleExamineRest implements ScmVehicleExamineFeign { return rb.success().setData(vo); } + @Override + @ApiOperation("PC端-获取验车管理列表") + @PostMapping("/selectCarInspectedList") + public ResultBean> selectCarInspectedList(PagerQuery pagerQuery) { + if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { + new ResultBean<>().success().setMsg("用户sid不能为空"); + } + PagerVo page = new PagerVo<>(); + IPage iPage = scmVehicleExamineService.selectCarInspectedList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } + @Override @ApiOperation("手机端-获取验车管理列表") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index 48b3718ff4..b0066eba16 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -136,6 +136,47 @@ public class ScmVehicleExamineService extends MybatisBaseService selectCarInspectedList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(pagerQuery.getParams().getUserSid()).getData().getSid(); + pagerQuery.getParams().setUseOrgSid(useOrgSid); + QueryWrapper qw = carInspectedQueryWrapper(pagerQuery.getParams()); + IPage iPage = baseMapper.selectCarInspectedList(page, qw); + return iPage; + } + + /** + * 手机端-获取验车管理列表 查询条件 + * + * @param query + * @return + */ + private QueryWrapper carInspectedQueryWrapper(ScmVehicleExaminePageQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("sve.useOrgSid", query.getUseOrgSid()); + } + if (StringUtils.isNotBlank(query.getVin())) { + qw.eq("sve.vinNo", query.getVin()); + } + if (StringUtils.isNotBlank(query.getModel())) { + qw.eq("sve.modelName", query.getModel()); + } + if (StringUtils.isNotBlank(query.getPurchaseType())) { + qw.eq("sve.purchaseTypeKey", query.getPurchaseType()); + } + if (StringUtils.isNotBlank(query.getType())) { + qw.eq("sve.inspectionResult", query.getType()); + } + return qw; + } + /** * 手机端-获取验车管理列表 * diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java index 4f6ad04d3e..0d452cc469 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.java @@ -55,42 +55,44 @@ import java.util.List; @Mapper public interface ScmVehicleInventoryMapper extends BaseMapper { - //@Update("update scm_vehicle_inventory set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from scm_vehicle_inventory") - List selectListVo(); + //@Update("update scm_vehicle_inventory set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - /** - * 手机端-获取盘库记录列表 - * - * @param page - * @param qw - * @param names - * @return - */ - IPage getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - /** - * 手机端-初始化盘库操作 - * - * @param recordSid - * @return - */ - AppScmVehicleStayInventoryInfoVo getInventory(@Param("recordSid") String recordSid); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - /** - * 手机端-盘库详情 - * - * @param recordSid - * @return - */ - AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(@Param("recordSid") String recordSid); + @Select("select * from scm_vehicle_inventory") + List selectListVo(); - @Update("update scm_vehicle_inventory set InventoryStateKey = #{inventoryStateKey},InventoryState = #{inventoryState} where sid = #{sid}") - void updateState(@Param("sid") String sid,@Param("inventoryStateKey") String inventoryStateKey,@Param("inventoryState") String inventoryState); + /** + * 手机端-获取盘库记录列表 + * + * @param page + * @param qw + * @param names + * @return + */ + IPage getCarInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); + + /** + * 手机端-初始化盘库操作 + * + * @param recordSid + * @return + */ + AppScmVehicleStayInventoryInfoVo getInventory(@Param("recordSid") String recordSid); + + /** + * 手机端-盘库详情 + * + * @param recordSid + * @return + */ + AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(@Param("recordSid") String recordSid); + + @Update("update scm_vehicle_inventory set InventoryStateKey = #{inventoryStateKey},InventoryState = #{inventoryState} where sid = #{sid}") + void updateState(@Param("sid") String sid, @Param("inventoryStateKey") String inventoryStateKey, @Param("inventoryState") String inventoryState); + + List getByVinLastInFo(@Param("vin") String vin,@Param("id") String id); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml index 425642b509..29839280ca 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml @@ -23,12 +23,9 @@ inventorySid, inventoryName, remarks, - ( SELECT count( certificate ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) ) - AS newInventoryDate, - ( SELECT count( location ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) ) AS - newWarehouse, - ( SELECT count( inventoryName ) FROM scm_vehicle_inventory WHERE mainSid = svi.mainSid AND Max( svi.createTime ) - ) AS newInventoryName + InventoryDate as newInventoryDate, + location as newWarehouse, + InventoryName as newInventoryName FROM scm_vehicle_inventory svi @@ -43,20 +40,16 @@ + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java index 53e2c0b18e..be312e40dc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java @@ -38,7 +38,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - /** * Project: anrui_scm(anrui_scm)
* File: ScmVehicleInventoryFeignFallback.java
@@ -57,79 +56,79 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("v1/scmvehicleinventory") public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign { - @Autowired - private ScmVehicleInventoryService scmVehicleInventoryService; + @Autowired + private ScmVehicleInventoryService scmVehicleInventoryService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = scmVehicleInventoryService.listPageVo(pq); - return rb.success().setData(pv); - } + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = scmVehicleInventoryService.listPageVo(pq); + return rb.success().setData(pv); + } - @Override - public ResultBean updateState(String sid,String inventoryStateKey,String inventoryState) { - return scmVehicleInventoryService.updateState(sid,inventoryStateKey,inventoryState); - } + @Override + public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState) { + return scmVehicleInventoryService.updateState(sid, inventoryStateKey, inventoryState); + } - @Override - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody ScmVehicleInventoryDto dto){ - ResultBean rb = ResultBean.fireFail(); - scmVehicleInventoryService.saveOrUpdateDto(dto); - return rb.success(); - } + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody ScmVehicleInventoryDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmVehicleInventoryService.saveOrUpdateDto(dto); + return rb.success(); + } - @Override - @ApiOperation("根据sid批量删除") + @Override + @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - scmVehicleInventoryService.delBySids(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + scmVehicleInventoryService.delBySids(sids); + return rb.success(); + } - @Override - @ApiOperation("根据SID获取一条记录") + @Override + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - ScmVehicleInventoryDetailsVo vo = scmVehicleInventoryService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + ScmVehicleInventoryDetailsVo vo = scmVehicleInventoryService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } - @Override - public ResultBean> getCarInventoryList(PagerQuery pagerQuery) { - if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { - new ResultBean<>().success().setMsg("用户sid不能为空"); - } - PagerVo page = new PagerVo<>(); - IPage iPage = scmVehicleInventoryService.getCarInventoryList(pagerQuery); - PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); - return new ResultBean>().success().setData(pagerVo); - } + @Override + public ResultBean> getCarInventoryList(PagerQuery pagerQuery) { + if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) { + new ResultBean<>().success().setMsg("用户sid不能为空"); + } + PagerVo page = new PagerVo<>(); + IPage iPage = scmVehicleInventoryService.getCarInventoryList(pagerQuery); + PagerVo pagerVo = PagerUtil.pageToVo(iPage, page); + return new ResultBean>().success().setData(pagerVo); + } - @Override - public ResultBean getInventory(String recordSid) { - ResultBean rb = ResultBean.fireFail(); - AppScmVehicleStayInventoryInfoVo vo = scmVehicleInventoryService.getInventory(recordSid); - return rb.success().setData(vo); - } + @Override + public ResultBean getInventory(String recordSid) { + ResultBean rb = ResultBean.fireFail(); + AppScmVehicleStayInventoryInfoVo vo = scmVehicleInventoryService.getInventory(recordSid); + return rb.success().setData(vo); + } - @Override - public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) { - ResultBean rb = ResultBean.fireFail(); - scmVehicleInventoryService.AppScmVehicleStayInventoryDto(dto); - return rb.success(); - } + @Override + public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) { + ResultBean rb = ResultBean.fireFail(); + scmVehicleInventoryService.saveInventory(dto); + return rb.success(); + } - @Override - public ResultBean getInventoryInfo(String recordSid) { - ResultBean rb = ResultBean.fireFail(); - AppScmVehicleStayInventoryDetailedsVo vo = scmVehicleInventoryService.getInventoryInfo(recordSid); - return rb.success().setData(vo); - } + @Override + public ResultBean getInventoryInfo(String recordSid) { + ResultBean rb = ResultBean.fireFail(); + AppScmVehicleStayInventoryDetailedsVo vo = scmVehicleInventoryService.getInventoryInfo(recordSid); + return rb.success().setData(vo); + } } 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 3dce68460d..7eab9391ad 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 @@ -47,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * Project: anrui_scm(anrui_scm)
@@ -64,170 +65,189 @@ import java.util.Date; @Service public class ScmVehicleInventoryService extends MybatisBaseService { - @Autowired - SysStaffOrgFeign sysStaffOrgFeign; - @Autowired - BaseVehicleFeign baseVehicleFeign; - @Autowired - ScmVehicleStayInventoryService scmVehicleStayInventoryService; - - private QueryWrapper createQueryWrapper(ScmVehicleInventoryQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - ScmVehicleInventoryQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("createOrgSid",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); - return p; - } - - public void saveOrUpdateDto(ScmVehicleInventoryDto dto){ + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + BaseVehicleFeign baseVehicleFeign; + @Autowired + ScmVehicleStayInventoryService scmVehicleStayInventoryService; + + private QueryWrapper createQueryWrapper(ScmVehicleInventoryQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + ScmVehicleInventoryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("createOrgSid", 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); + return p; + } + + public void saveOrUpdateDto(ScmVehicleInventoryDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(ScmVehicleInventoryDto dto){ - ScmVehicleInventory entity = new ScmVehicleInventory(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(ScmVehicleInventoryDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(ScmVehicleInventoryDto dto) { + ScmVehicleInventory entity = new ScmVehicleInventory(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(ScmVehicleInventoryDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - ScmVehicleInventory entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public ScmVehicleInventoryDetailsVo fetchDetailsVoBySid(String sid){ - ScmVehicleInventory entity = fetchBySid(sid); - ScmVehicleInventoryDetailsVo vo = new ScmVehicleInventoryDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - /** - * 手机端-获取盘库记录列表 - * - * @param pagerQuery - * @return - */ - public IPage getCarInventoryList(PagerQuery pagerQuery) { - IPage page = PagerUtil.queryToPage(pagerQuery); - String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); - pagerQuery.getParams().setUseOrgSid(useOrgSid); - QueryWrapper qw = appCarQueryWrapper(pagerQuery.getParams()); - AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams(); - IPage iPage = baseMapper.getCarInventoryList(page, qw, params.getNames()); - return iPage; - } - - /** - * 手机端-获取盘库记录列表 查询条件 - * - * @param query - * @return - */ - private QueryWrapper appCarQueryWrapper(AppScmVehicleCarInventoryListPageQuery query) { - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("svi.createOrgSid", query.getUseOrgSid()); - } - if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.eq("svi.locationSid", query.getWarehouseSid()); - } - if (StringUtils.isNotBlank(query.getState())) { - qw.eq("svi.InventoryState", query.getState()); - } - return qw; - } - - /** - * 手机端-初始化盘库操作 - * - * @param recordSid - * @return - */ - public AppScmVehicleStayInventoryInfoVo getInventory(String recordSid) { - AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid); - return vo; - } - - /** - * 手机端-保存盘库操作 - * - * @param dto - * @return - */ - @Transactional(rollbackFor = Exception.class) - public ResultBean AppScmVehicleStayInventoryDto(AppScmVehicleStayInventoryDto dto) { - ResultBean rb = ResultBean.fireFail(); - String inventorySid = dto.getInventorySid(); + } + ScmVehicleInventory entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public ScmVehicleInventoryDetailsVo fetchDetailsVoBySid(String sid) { + ScmVehicleInventory entity = fetchBySid(sid); + ScmVehicleInventoryDetailsVo vo = new ScmVehicleInventoryDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + /** + * 手机端-获取盘库记录列表 + * + * @param pagerQuery + * @return + */ + public IPage getCarInventoryList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); + pagerQuery.getParams().setUseOrgSid(useOrgSid); + QueryWrapper qw = appCarQueryWrapper(pagerQuery.getParams()); + AppScmVehicleCarInventoryListPageQuery params = pagerQuery.getParams(); + IPage iPage = baseMapper.getCarInventoryList(page, qw, params.getNames()); + return iPage; + } + + /** + * 手机端-获取盘库记录列表 查询条件 + * + * @param query + * @return + */ + private QueryWrapper appCarQueryWrapper(AppScmVehicleCarInventoryListPageQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("svi.createOrgSid", query.getUseOrgSid()); + } + if (StringUtils.isNotBlank(query.getWarehouseSid())) { + qw.eq("svi.locationSid", query.getWarehouseSid()); + } + if (StringUtils.isNotBlank(query.getState())) { + qw.eq("svi.InventoryStateKey", query.getState()); + } + return qw; + } + + /** + * 手机端-初始化盘库操作 + * + * @param recordSid + * @return + */ + public AppScmVehicleStayInventoryInfoVo getInventory(String recordSid) { + AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid); + vo.setLastData("无"); + vo.setLastName("无"); + return vo; + } + + /** + * 手机端-保存盘库操作 + * + * @param dto + * @return + */ + @Transactional(rollbackFor = Exception.class) + public ResultBean saveInventory(AppScmVehicleStayInventoryDto dto) { + ResultBean rb = ResultBean.fireFail(); + String createOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getLoginSid()).getData(); + String inventorySid = dto.getInventorySid(); /*String[] split = inventorySid.split(","); if (split.length < 2){ return rb.setMsg("请选择盘库人员"); }*/ - String inventoryName = dto.getInventoryName(); - if (StringUtils.isBlank(inventoryName)){ - return rb.setMsg("请选择盘库人员"); - } - String sid = dto.getSid(); - scmVehicleStayInventoryService.delBySid(sid,dto.getInventoryName()); - ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory(); - BeanUtil.copyProperties(dto, scmVehicleInventory, "sid"); - scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date())); - String loginName = dto.getLoginName(); - String loginSid = dto.getLoginSid(); - inventoryName += "、" + loginName; - inventorySid += "," + loginSid; - scmVehicleInventory.setInventoryName(inventoryName); - scmVehicleInventory.setInventorySid(inventorySid); - save(scmVehicleInventory); - return rb.success().setMsg("保存成功"); - } - - /** - * 手机端-盘库详情 - * - * @param recordSid - * @return - */ - public AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(String recordSid) { - AppScmVehicleStayInventoryDetailedsVo vo = baseMapper.getInventoryInfo(recordSid); - return vo; - } - - public ResultBean updateState(String sid,String inventoryStateKey,String inventoryState) { - ResultBean rb = ResultBean.fireFail(); - baseMapper.updateState(sid,inventoryStateKey,inventoryState); - return rb.success().setMsg("修改保存成功"); - } + String inventoryName = dto.getInventoryName(); + if (StringUtils.isBlank(inventoryName)) { + return rb.setMsg("请选择盘库人员"); + } + String sid = dto.getSid(); + scmVehicleStayInventoryService.delBySid(sid, dto.getInventoryName()); + ScmVehicleInventory scmVehicleInventory = new ScmVehicleInventory(); + BeanUtil.copyProperties(dto, scmVehicleInventory, "sid"); + scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date())); + String loginName = dto.getLoginName(); + String loginSid = dto.getLoginSid(); + inventoryName += "、" + loginName; + inventorySid += "," + loginSid; + scmVehicleInventory.setInventoryName(inventoryName); + scmVehicleInventory.setInventorySid(inventorySid); + scmVehicleInventory.setCreateOrgSid(createOrgSid); + save(scmVehicleInventory); + return rb.success().setMsg("保存成功"); + } + + /** + * 手机端-盘库详情 + * + * @param recordSid + * @return + */ + public AppScmVehicleStayInventoryDetailedsVo getInventoryInfo(String recordSid) { + AppScmVehicleStayInventoryDetailedsVo vo = baseMapper.getInventoryInfo(recordSid); + LastInfo lastInfo = new LastInfo(); + ScmVehicleInventory scmVehicleInventory = null; + List list = baseMapper.getByVinLastInFo(vo.getVin(), vo.getId()); + if (list.size() >= 1) { + scmVehicleInventory = list.get(0); + lastInfo.setLastDate(scmVehicleInventory.getInventoryDate()); + lastInfo.setLastName(scmVehicleInventory.getInventoryName()); + lastInfo.setLastWarehouse(scmVehicleInventory.getLocation()); + lastInfo.setLastState(scmVehicleInventory.getInventoryState()); + lastInfo.setLastCertificateState(scmVehicleInventory.getCertificate()); + lastInfo.setLastRemarks(scmVehicleInventory.getRemarks()); + vo.setLastInfo(lastInfo); + } else { + vo.setLastInfo(null); + } + return vo; + } + + public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.updateState(sid, inventoryStateKey, inventoryState); + return rb.success().setMsg("修改保存成功"); + } } \ No newline at end of file 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 4deef9fdf0..e126ad3853 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 @@ -81,12 +81,12 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmVehicleStayInventoryQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("svsi.createOrgSid",query.getCreateOrgSid()); - if (StringUtils.isNotBlank(query.getMainSid())){ - qw.like("svsi.mainSid",query.getMainSid()); + qw.eq("svsi.createOrgSid", query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getMainSid())) { + qw.like("svsi.mainSid", query.getMainSid()); } - if (StringUtils.isNotBlank(query.getLocationSid())){ - qw.eq("svsi.locationSid",query.getLocationSid()); + if (StringUtils.isNotBlank(query.getLocationSid())) { + qw.eq("svsi.locationSid", query.getLocationSid()); } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -138,7 +138,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService pathSidByUserSid = sysStaffOrgFeign.getPathSidByUserSid(userSid); String orgSid = pathSidByUserSid.getData(); List scmVehicleStayInventoryVos = baseMapper.selectListVo(orgSid); - if (scmVehicleStayInventoryVos.size() > 0){ + if (scmVehicleStayInventoryVos.size() > 0) { return rb.setMsg("生成盘库记录失败，请查看是否有未盘库的记录"); } for (AppScmInventoryRecordsVo appScmInventoryRecordsVo : list) { @@ -165,6 +165,11 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService qw = appQueryWrapper(pagerQuery.getParams()); AppScmVehicleStayInventoryListPageQuery params = pagerQuery.getParams(); IPage iPage = baseMapper.getInventoryList(page, qw, params.getNames()); + List records = iPage.getRecords(); + for (AppScmVehicleStayInventoryListPageVo record : records) { + record.setInventoryDate("无"); + record.setInventoryName("无"); + } return iPage; } @@ -176,6 +181,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService appQueryWrapper(AppScmVehicleStayInventoryListPageQuery query) { QueryWrapper qw = new QueryWrapper<>(); + qw.eq("svsi.isDelete", "0"); if (StringUtils.isNotBlank(query.getUseOrgSid())) { qw.eq("svsi.createOrgSid", query.getUseOrgSid()); } @@ -183,7 +189,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService