From a6c1d3ff9c317a69da23deb16fd0298aa8307627 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 6 Apr 2022 17:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scmvehiclereturn/ScmVehicleReturn.java | 21 ++++++++ .../ScmVehicleReturnFeign.java | 28 +++++++++++ .../ScmVehicleReturnFeignFallback.java | 12 +++++ .../ScmVehicleReturnQuery.java | 22 +++++++++ .../scmvehiclereturn/ScmVehicleReturnVo.java | 28 +++++++++++ .../ScmVehicleReturnDetails.java | 27 ++++++++++ doc/databases/scm_tables.sql | 49 +++++++++++++++++++ 7 files changed, 187 insertions(+) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeignFallback.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetails.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java new file mode 100644 index 0000000000..4e48dc56bd --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:12 + * @Description + */ +@Data +public class ScmVehicleReturn extends BaseEntity { + private static final long serialVersionUID = -6050914358262441388L; + @ApiModelProperty(value = "申请编号") + private String applicationCode; + @ApiModelProperty(value = "申请人") + private String applicationName; + @ApiModelProperty(value = "退库原因") + private String reason; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java new file mode 100644 index 0000000000..1a46874164 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeign.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +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.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; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:39 + * @Description + */ +@FeignClient( + contextId = "anrui-scm-ScmVehicleReturn", + name = "anrui-scm", + path = "v1/scmvehiclereturn", + fallback = ScmVehicleReturnFeignFallback.class) +public interface ScmVehicleReturnFeign { + + @ApiOperation("分页列表") + @PostMapping("/listPage") + @ResponseBody + ResultBean> listPage(@RequestBody PagerQuery pagerQuery); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeignFallback.java new file mode 100644 index 0000000000..8f2befc9cf --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:40 + * @Description + */ +@Component +public class ScmVehicleReturnFeignFallback { +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java new file mode 100644 index 0000000000..44ec1a1e7d --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:55 + * @Description + */ +@Data +public class ScmVehicleReturnQuery implements Query { + private static final long serialVersionUID = 3301749651674469965L; + @ApiModelProperty(value = "开始日期") + private String applyDateStart; + + @ApiModelProperty(value = "结束日期") + private String applyDateEnd; + + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java new file mode 100644 index 0000000000..feed0ad8c8 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.scm.api.scmvehiclereturn; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:48 + * @Description + */ +@Data +public class ScmVehicleReturnVo implements Vo { + private static final long serialVersionUID = 115347131385810982L; + @ApiModelProperty(value = "sid") + private String sid; + @ApiModelProperty(value = "状态") + private String state; + @ApiModelProperty(value = "申请编号") + private String applicationCode; + @ApiModelProperty(value = "申请人") + private String applicationName; + @ApiModelProperty(value = "申请日期") + private String createTime; + @ApiModelProperty(value = "退库原因") + private String reason; + +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetails.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetails.java new file mode 100644 index 0000000000..56fcd8ed33 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetails.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.scm.api.scmvehiclereturndetails; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2022/4/6 16:24 + * @Description + */ +@Data +public class ScmVehicleReturnDetails extends BaseEntity { + private static final long serialVersionUID = 67935382962875224L; + @ApiModelProperty(value = "采购退库申请sid") + private String vehicleOutSid; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty(value = "常用配置") + private String configName; + @ApiModelProperty(value = "入库日期") + private Date inboundDate; +} diff --git a/doc/databases/scm_tables.sql b/doc/databases/scm_tables.sql index 9fa90b9980..3a613358d6 100644 --- a/doc/databases/scm_tables.sql +++ b/doc/databases/scm_tables.sql @@ -646,4 +646,53 @@ CREATE TABLE `scm_vehicle_inbound` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='车辆入库管理表'; +-- 车辆采购退库 +DROP TABLE IF EXISTS `scm_vehicle_return`; +CREATE TABLE `scm_vehicle_return` +( + `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(申请人sid)', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `applicationCode` varchar(64) DEFAULT NULL COMMENT '申请编号', + `applicationName` varchar(64) DEFAULT NULL COMMENT '申请人', + `reason` varchar(500) DEFAULT NULL COMMENT '退库原因', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='车辆采购退库'; + + +-- 车辆采购退库详细 +DROP TABLE IF EXISTS `scm_vehicle_return_details`; +CREATE TABLE `scm_vehicle_return_details` +( + `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', + `vehicleOutSid` varchar(64) DEFAULT NULL COMMENT '采购退库申请sid', + `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', + `modelName` varchar(500) DEFAULT NULL COMMENT '车型名称', + `configName` varchar(500) DEFAULT NULL COMMENT '常用配置', + `inboundDate` timestamp null DEFAULT NULL COMMENT '入库日期', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='车辆采购退库详细'; +