From a80abdd7557dfb7c48fd030baea8f5245b1ce3ae Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 5 Jun 2023 13:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E7=A7=BB=E4=BA=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmTransferRecordEnum.java | 29 +++++++++++++++++++ .../ScmTransferRecords.java | 4 +++ .../ScmTransferRecordsDto.java | 5 ++++ .../ScmTransferRecordsService.java | 7 ++--- doc/databases/scm_tables.sql | 2 ++ 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java new file mode 100644 index 0000000000..7c6a6fcf2e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordEnum.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.scm.api.scmtransferrecords; + +/** + * @description: 物品移交类型 + * @author: dimengzhe + * @date: 2023/6/5 + **/ +public enum ScmTransferRecordEnum { + + + FP("01", "发票"), + HGZ("02", "合格证"), + ; + private final String code; + private final String remarks; + + ScmTransferRecordEnum(String code, String remarks) { + this.code = code; + this.remarks = remarks; + } + + public String getCode() { + return code; + } + + public String getRemarks() { + return remarks; + } +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java index bd10543348..7d022bc841 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecords.java @@ -59,4 +59,8 @@ public class ScmTransferRecords extends BaseEntity { private String useOrgSid; @ApiModelProperty("使用组织名称") private String useOrgName; + @ApiModelProperty("移交物品类别") + private String goodsType; + @ApiModelProperty("移交物品类别key") + private String goodsTypeKey; } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java index a04aa56634..2abf0b1cc4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java @@ -42,4 +42,9 @@ public class ScmTransferRecordsDto implements Dto { private String useOrgSid; @ApiModelProperty("使用组织名称") private String useOrgName; + + @ApiModelProperty("移交物品类别") + private String goodsType; + @ApiModelProperty("移交物品类别key") + private String goodsTypeKey; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java index 0930911aaf..4b241067af 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java @@ -3,10 +3,7 @@ package com.yxt.anrui.scm.biz.scmtransferrecords; 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.scm.api.scmtransferrecords.ScmTransferRecords; -import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsDto; -import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsQuery; -import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo; +import com.yxt.anrui.scm.api.scmtransferrecords.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -31,7 +28,7 @@ public class ScmTransferRecordsService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.pagerList(page, qw); diff --git a/doc/databases/scm_tables.sql b/doc/databases/scm_tables.sql index 26c59aa514..24a57553b6 100644 --- a/doc/databases/scm_tables.sql +++ b/doc/databases/scm_tables.sql @@ -949,6 +949,8 @@ CREATE TABLE `scm_transfer_records` `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', `goodsSid` varchar(64) DEFAULT NULL COMMENT '移交物品sid', `goodsName` varchar(64) DEFAULT NULL COMMENT '移交物品名称', + `goodsType` varchar(64) DEFAULT NULL COMMENT '移交物品类别', + `goodsTypeKey` varchar(64) DEFAULT NULL COMMENT '移交物品类别Key', `contractNo` varchar(200) DEFAULT NULL COMMENT '合同编号', `vinNo` varchar(64) DEFAULT NULL COMMENT '车架号', `vinSid` varchar(64) DEFAULT NULL COMMENT '车辆sid',