Browse Source

移库问题修改,简易订单问题修改

master
hp 3 years ago
parent
commit
3a2586ea4c
  1. 60
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstate.java
  2. 61
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDetailsVo.java
  3. 61
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java
  4. 83
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java
  5. 77
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java
  6. 59
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateQuery.java
  7. 61
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java
  8. 66
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java
  9. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.xml
  10. 102
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java
  11. 110
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java
  12. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
  13. 4
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  14. 7
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java
  15. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
  16. 33
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  17. 60
      doc/databases/base_tables_vehicle.sql

60
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstate.java

@ -0,0 +1,60 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicletempstate;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstate.java <br/>
* Class: aaaa.api.basevehicletempstate.BaseVehicleTempstate <br/>
* Description: 车辆临时状态表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆临时状态表", description = "车辆临时状态表")
@TableName("base_vehicle_tempstate")
public class BaseVehicleTempstate extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
}

61
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDetailsVo.java

@ -0,0 +1,61 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicletempstate;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateVo.java <br/>
* Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateVo <br/>
* Description: 车辆临时状态表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆临时状态表 视图数据详情", description = "车辆临时状态表 视图数据详情")
public class BaseVehicleTempstateDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
}

61
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateDto.java

@ -0,0 +1,61 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicletempstate;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateDto.java <br/>
* Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateDto <br/>
* Description: 车辆临时状态表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆临时状态表 数据传输对象", description = "车辆临时状态表 数据传输对象")
public class BaseVehicleTempstateDto implements Dto {
private String sid; // sid
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
}

83
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java

@ -0,0 +1,83 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicletempstate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateFeign.java <br/>
* Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateFeign <br/>
* Description: 车辆临时状态表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆临时状态表")
@FeignClient(
contextId = "comc-BaseVehicleTempstate",
name = "comc",
path = "v1/basevehicletempstate",
fallback = BaseVehicleTempstateFeignFallback.class)
public interface BaseVehicleTempstateFeign {
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
@ResponseBody
public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(@RequestBody PagerQuery<BaseVehicleTempstateQuery> pq);
@ApiOperation("新增或修改")
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseVehicleTempstateDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("根据业务sid删除记录")
@DeleteMapping("/delByBusSid")
@ResponseBody
public ResultBean delByBusSid(String businessSid);
}

77
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java

@ -0,0 +1,77 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicletempstate;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateFeignFallback.java <br/>
* Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateFeignFallback <br/>
* Description: 车辆临时状态表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFeign {
@Override
public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(PagerQuery<BaseVehicleTempstateQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口comc/basevehicletempstate/listPage无法访问");
}
@Override
public ResultBean save(BaseVehicleTempstateDto dto){
return ResultBean.fireFail().setMsg("接口comc/basevehicletempstate/save无法访问");
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口comc/basevehicletempstate/delBySids无法访问");
}
@Override
public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口comc/basevehicletempstate/fetchDetailsBySid无法访问");
}
@Override
public ResultBean delByBusSid(String businessSid) {
return null;
}
}

59
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateQuery.java

@ -0,0 +1,59 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicletempstate;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateQuery.java <br/>
* Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateQuery <br/>
* Description: 车辆临时状态表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆临时状态表 查询条件", description = "车辆临时状态表 查询条件")
public class BaseVehicleTempstateQuery implements Query {
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
}

61
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateVo.java

@ -0,0 +1,61 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.api.basevehicletempstate;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateVo.java <br/>
* Class: aaaa.api.basevehicletempstate.BaseVehicleTempstateVo <br/>
* Description: 车辆临时状态表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "车辆临时状态表 视图数据对象", description = "车辆临时状态表 视图数据对象")
public class BaseVehicleTempstateVo implements Vo {
private String sid; // sid
@ApiModelProperty("车辆sid")
private String vehSid; // 车辆sid
@ApiModelProperty("数据字典项key,如移位申请中 001 状态")
private String tempStateKey; // 数据字典项key,如移位申请中 001 状态
@ApiModelProperty("业务sid")
private String busSid; // 业务sid
}

66
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java

@ -0,0 +1,66 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basevehicletempstate;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateMapper.java <br/>
* Class: aaaa.biz.basevehicletempstate.BaseVehicleTempstateMapper <br/>
* Description: 车辆临时状态表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface BaseVehicleTempstateMapper extends BaseMapper<BaseVehicleTempstate> {
//@Update("update base_vehicle_tempstate set name=#{msg} where id=#{id}")
//IPage<BaseVehicleTempstateVo> voPage(IPage<BaseVehicleTempstate> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleTempstate> qw);
IPage<BaseVehicleTempstateVo> selectPageVo(IPage<BaseVehicleTempstate> page, @Param(Constants.WRAPPER) Wrapper<BaseVehicleTempstate> qw);
List<BaseVehicleTempstateVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehicleTempstate> qw);
@Select("select * from base_vehicle_tempstate")
List<BaseVehicleTempstateVo> selectListVo();
}

15
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.xml

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.base.biz.basevehicletempstate.BaseVehicleTempstateMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo">
SELECT * FROM base_vehicle_tempstate
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateVo">
SELECT * FROM base_vehicle_tempstate
<where>${ew.sqlSegment}</where>
</select>
</mapper>

102
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java

@ -0,0 +1,102 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basevehicletempstate;
import com.yxt.anrui.base.api.basevehicletempstate.*;
import com.yxt.common.core.query.PagerQuery;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateFeignFallback.java <br/>
* Class: aaaa.biz.basevehicletempstate.BaseVehicleTempstateRest <br/>
* Description: 车辆临时状态表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "车辆临时状态表")
@RestController("aaaa.biz.basevehicletempstate.BaseVehicleTempstateRest")
@RequestMapping("v1/basevehicletempstate")
public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign {
@Autowired
private BaseVehicleTempstateService baseVehicleTempstateService;
@Override
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<BaseVehicleTempstateVo>> listPage(@RequestBody PagerQuery<BaseVehicleTempstateQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<BaseVehicleTempstateVo> pv = baseVehicleTempstateService.listPageVo(pq);
return rb.success().setData(pv);
}
@Override
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody BaseVehicleTempstateDto dto){
ResultBean rb = ResultBean.fireFail();
baseVehicleTempstateService.saveOrUpdateDto(dto);
return rb.success();
}
@Override
@ApiOperation("根据sid批量删除")
@PostMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
baseVehicleTempstateService.delBySids(sids);
return rb.success();
}
@Override
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<BaseVehicleTempstateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
BaseVehicleTempstateDetailsVo vo = baseVehicleTempstateService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@Override
public ResultBean delByBusSid(String businessSid) {
ResultBean rb = ResultBean.fireFail();
baseVehicleTempstateService.delByBusSid(businessSid);
return rb.success();
}
}

110
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java

@ -0,0 +1,110 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.base.biz.basevehicletempstate;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicletempstate.*;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: comc(comc) <br/>
* File: BaseVehicleTempstateService.java <br/>
* Class: aaaa.biz.basevehicletempstate.BaseVehicleTempstateService <br/>
* Description: 车辆临时状态表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-06 09:07:56 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BaseVehicleTempstateService extends MybatisBaseService<BaseVehicleTempstateMapper, BaseVehicleTempstate> {
private QueryWrapper<BaseVehicleTempstate> createQueryWrapper(BaseVehicleTempstateQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<BaseVehicleTempstate> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<BaseVehicleTempstateVo> listPageVo(PagerQuery<BaseVehicleTempstateQuery> pq) {
BaseVehicleTempstateQuery query = pq.getParams();
QueryWrapper<BaseVehicleTempstate> qw = createQueryWrapper(query);
IPage<BaseVehicleTempstate> page = PagerUtil.queryToPage(pq);
IPage<BaseVehicleTempstateVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseVehicleTempstateVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(BaseVehicleTempstateDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(BaseVehicleTempstateDto dto) {
BaseVehicleTempstate entity = new BaseVehicleTempstate();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(BaseVehicleTempstateDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
BaseVehicleTempstate entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public BaseVehicleTempstateDetailsVo fetchDetailsVoBySid(String sid) {
BaseVehicleTempstate entity = fetchBySid(sid);
BaseVehicleTempstateDetailsVo vo = new BaseVehicleTempstateDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void delByBusSid(String businessSid) {
deleteBySid(businessSid);
}
}

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@ -101,6 +101,7 @@
</if>
</where>
</if>
order by bmd.id desc
</select>
<delete id="deleteVirtualOrder">

4
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -5,8 +5,8 @@ package com.yxt.anrui.flowable.api.utils;
*/
public enum ProcDefEnum {
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:2:487504"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:3:487508"),
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
// CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"),

7
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java

@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ -33,7 +34,11 @@ public class ScmVehicleGressionPageVo implements Vo {
private String downloadUrl;
@ApiModelProperty("现场照片")
private List<String> images;
private List<String> images = new ArrayList<>();
@ApiModelProperty("保单照片")
private List<String> policyImage = new ArrayList<>();
@ApiModelProperty("临牌")
private String temporaryCard; // 临牌
@ApiModelProperty("是否显示删除 流程未提交时 显示")
private boolean showDetectBtn;

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@ -33,7 +33,8 @@
svg.targetLocation,
svg.operator,
svg.procDefId,
svg.procInstId
svg.procInstId,
svg.temporaryCard
FROM scm_vehicle_gression svg
<where>
${ew.sqlSegment}

33
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -33,6 +33,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto;
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
@ -137,6 +139,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
private MessageFeign messageFeign;
@Autowired
private ScmVehicleGressionVehService scmVehicleGressionVehService;
@Autowired
BaseVehicleTempstateFeign baseVehicleTempstateFeign;
private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -193,7 +197,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
* @return
*/
public IPage<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
String type = "05";
IPage<ScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
pagerQuery.getParams().setUseOrgSid(useOrgSid);
@ -201,17 +204,26 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
List<ScmVehicleGressionPageVo> records = iPage.getRecords();
for (ScmVehicleGressionPageVo record : records) {
String sid = record.getSid();
String type1 = "04"; //保单照片
String type2 = "05"; //现场照片
List<String> policyImage = new ArrayList<>();
List<String> image = new ArrayList<>();
//查询出门证
ScmExitPermit scmExitPermit = scmExitPermitService.selectByLinkSid(record.getSid());
if (scmExitPermit != null) {
record.setDownloadUrl(fileUploadComponent.getUrlPrefix() + scmExitPermit.getUrl());
}
List<String> list1 = new ArrayList<>();
List<ScmFile> list = scmFileService.getByLinkSidAndType(record.getSid(), type);
for (ScmFile scmFile : list) {
list1.add(scmFile.getFilePath());
List<ScmFile> scmFiles1 = scmFileService.getByLinkSidAndType(sid, type1);
for (ScmFile scmFile : scmFiles1) {
policyImage.add(scmFile.getFilePath());
}
record.setPolicyImage(policyImage);
List<ScmFile> scmFiles2 = scmFileService.getByLinkSidAndType(record.getSid(), type2);
for (ScmFile scmFile : scmFiles2) {
image.add(scmFile.getFilePath());
}
record.setImages(list1);
record.setImages(image);
}
return iPage;
}
@ -668,6 +680,13 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
}
List<String> vins = dto.getVins();
for (String vin : vins) {
//推送车辆移库状态
BaseVehicleVo baseVehicleVo = baseVehicleFeign.selVehicleByVinNo(vin).getData();
BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto();
baseVehicleTempstateDto.setVehSid(baseVehicleVo.getSid());
baseVehicleTempstateDto.setTempStateKey("001");
baseVehicleTempstateDto.setBusSid(scmVehicleGression.getSid());
baseVehicleTempstateFeign.save(baseVehicleTempstateDto);
List<String> sids = scmVehicleGressionVehService.fetchVoByVins(vin);
for (String sid : sids) {
List<ScmVehicleGressionVo> scmVehicleGressionVos = baseMapper.getlastTimeEqual(sid, dto.getTargetLocationSid());
@ -828,6 +847,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
messageFlowableQuery.setMsgContent(scmVehicleGression.getApplicantName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("供应链");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
//删除申请状态
baseVehicleTempstateFeign.delByBusSid(bv.getBusinessSid());
}
return rb.success().setData(resultBean.getData());

60
doc/databases/base_tables_vehicle.sql

@ -3,23 +3,47 @@
DROP TABLE IF EXISTS `base_vehmodel_config`;
CREATE TABLE `base_vehmodel_config`
(
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
`state` int(32) DEFAULT '1' COMMENT '状态',
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注',
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
`modelSid` varchar(255) DEFAULT NULL COMMENT '车型sid',
`configurationItemsSid` varchar(255) DEFAULT NULL COMMENT '简述配置sid',
`manufactorSettlementPrice` varchar(255) DEFAULT NULL COMMENT '厂家结算价',
`salesReferencePrice` varchar(255) DEFAULT NULL COMMENT '销售参考价',
`priceValidity` varchar(255) DEFAULT NULL COMMENT '价格有效期',
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
`state` int(32) DEFAULT '1' COMMENT '状态',
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注',
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
`modelSid` varchar(255) DEFAULT NULL COMMENT '车型sid',
`configurationItemsSid` varchar(255) DEFAULT NULL COMMENT '简述配置sid',
`manufactorSettlementPrice` varchar(255) DEFAULT NULL COMMENT '厂家结算价',
`salesReferencePrice` varchar(255) DEFAULT NULL COMMENT '销售参考价',
`priceValidity` varchar(255) DEFAULT NULL COMMENT '价格有效期',
PRIMARY KEY (`id`),
KEY `id` (`id`)
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='车型与简述配置关联表';
DEFAULT CHARSET = utf8 COMMENT ='车型与简述配置关联表';
DROP TABLE IF EXISTS `base_vehicle_tempState`;
CREATE TABLE `base_vehicle_tempState`
(
`id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id',
`sid` varchar(64) NOT NULL COMMENT 'sid',
`lockVersion` int(32) DEFAULT '0' COMMENT '版本锁',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
`isEnable` int(32) DEFAULT '1' COMMENT '是否可用:1可用,0不可用',
`state` int(32) DEFAULT '1' COMMENT '状态',
`isDelete` int(32) DEFAULT '0' COMMENT '是否删除:0未删除,1已删除',
`remarks` varchar(255) DEFAULT NULL COMMENT '备注',
`createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid',
`updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid',
`vehSid` varchar(255) DEFAULT NULL COMMENT '车辆sid',
`tempStateKey` varchar(255) DEFAULT NULL COMMENT '数据字典项key,如移位申请中 001 状态',
`busSid` varchar(255) DEFAULT NULL COMMENT '业务sid',
PRIMARY KEY (`id`),
KEY `id` (`id`)
) ENGINE = INNODB
DEFAULT CHARSET = utf8 COMMENT ='车辆临时状态表';
Loading…
Cancel
Save