From 6a79144a39324e195e6530df19cbd01643626a94 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 9 Jan 2023 17:10:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E8=A1=A5=E5=8D=95=E5=8D=95=E6=8D=AE=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=BD=AC=E5=8D=95=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=92=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBusTypeChangeController.java | 15 + .../basic/BasicBusTypePreController.java | 14 + .../basic/BasicBussinessTypeController.java | 19 ++ .../thrsys/ThrBusTypeOriginController.java | 15 + .../api/dao/basic/BasicBusTypeChangeDao.java | 12 + .../api/dao/basic/BasicBusTypePreDao.java | 13 + .../api/dao/basic/BasicBussinessTypeDao.java | 11 + .../api/dao/thrsys/ThrBusTypeOriginDao.java | 13 + .../basic/BasicBusTypeChangeEntity.java | 113 +++++++ .../entity/basic/BasicBusTypePreEntity.java | 161 ++++++++++ .../basic/BasicBussinessTypeEntity.java | 276 ++++++++++++++++++ .../entity/thrsys/ThrBusTypeOriginEntity.java | 113 +++++++ .../req/basic/FilterBussinessTypeRequest.java | 107 +++++++ .../res/basic/BasicBussinessTypeResponse.java | 10 + .../basic/IBasicBusTypeChangeService.java | 7 + .../basic/IBasicBusTypePreService.java | 7 + .../basic/IBasicBussinessTypeService.java | 7 + .../impl/BasicBusTypeChangeServiceImpl.java | 12 + .../impl/BasicBusTypePreServiceImpl.java | 12 + .../impl/BasicBussinessTypeServiceImpl.java | 17 ++ .../thrsys/IThrBusTypeOriginService.java | 7 + .../impl/ThrBusTypeOriginServiceImpl.java | 12 + .../mapper/basic/BasicBusTypeChangeDao.xml | 5 + .../mapper/basic/BasicBusTypePreDao.xml | 5 + .../mapper/basic/BasicBussinessTypeDao.xml | 7 + .../mapper/thrsys/ThrBusTypeOriginDao.xml | 5 + 26 files changed, 995 insertions(+) create mode 100644 src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java create mode 100644 src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java create mode 100644 src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java create mode 100644 src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java create mode 100644 src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java create mode 100644 src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java create mode 100644 src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java create mode 100644 src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java create mode 100644 src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java create mode 100644 src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java create mode 100644 src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java create mode 100644 src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java create mode 100644 src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java create mode 100644 src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java create mode 100644 src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java create mode 100644 src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java create mode 100644 src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java create mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java create mode 100644 src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java create mode 100644 src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml create mode 100644 src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml create mode 100644 src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml create mode 100644 src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java new file mode 100644 index 00000000..3d3e3734 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java @@ -0,0 +1,15 @@ +package com.glxp.api.controller.basic; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +/** + * 单据转换设置接口 + */ +@Slf4j +@RestController +public class BasicBusTypeChangeController { + + + +} diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java new file mode 100644 index 00000000..32df870a --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicBusTypePreController.java @@ -0,0 +1,14 @@ +package com.glxp.api.controller.basic; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +/** + * 补单单据类型接口 + */ +@Slf4j +@RestController +public class BasicBusTypePreController { + + +} diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java new file mode 100644 index 00000000..b7c9ce1b --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -0,0 +1,19 @@ +package com.glxp.api.controller.basic; + +import com.glxp.api.service.basic.IBasicBussinessTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 单据类型接口 + */ +@Slf4j +@RestController +public class BasicBussinessTypeController { + + @Resource + private IBasicBussinessTypeService basicBussinessTypeService; + +} diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java new file mode 100644 index 00000000..4fa59c7c --- /dev/null +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrBusTypeOriginController.java @@ -0,0 +1,15 @@ +package com.glxp.api.controller.thrsys; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RestController; + +/** + * 第三方单据类型接口 + */ +@Slf4j +@RestController +public class ThrBusTypeOriginController { + + + +} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java new file mode 100644 index 00000000..7096a82a --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypeChangeDao.java @@ -0,0 +1,12 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 单据转换表查询接口 + */ +@Mapper +public interface BasicBusTypeChangeDao extends BaseMapper { +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java new file mode 100644 index 00000000..72ffc0cd --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicBusTypePreDao.java @@ -0,0 +1,13 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 补单单据类型查询接口 + */ +@Mapper +public interface BasicBusTypePreDao extends BaseMapper { + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java new file mode 100644 index 00000000..5f9e26f5 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java @@ -0,0 +1,11 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface BasicBussinessTypeDao extends BaseMapper { + + +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java new file mode 100644 index 00000000..4f44e924 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java @@ -0,0 +1,13 @@ +package com.glxp.api.dao.thrsys; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 第三方单据类型表查询接口 + */ +@Mapper +public interface ThrBusTypeOriginDao extends BaseMapper { + +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java new file mode 100644 index 00000000..5e09af79 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypeChangeEntity.java @@ -0,0 +1,113 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 单据转换实体类 + */ +@Data +@TableName(value = "basic_bustype_change") +public class BasicBusTypeChangeEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 原单据类型代码 + */ + @TableField(value = "originAction") + private String originAction; + + /** + * 原单据类型名称 + */ + @TableField(value = "originName") + private String originName; + + /** + * 目标单据类型 + */ + @TableField(value = "targetAction") + private String targetAction; + + /** + * 1:领用单据类型；2.产品申购类型；3.采购计划单据类型 + */ + @TableField(value = "`type`") + private Boolean type; + + /** + * 0:启用；1:禁用 + */ + @TableField(value = "`enable`") + private Boolean enable; + + /** + * 是否系统预设 + */ + @TableField(value = "systemDefault") + private Boolean systemDefault; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_ORIGINACTION = "originAction"; + + public static final String COL_ORIGINNAME = "originName"; + + public static final String COL_TARGETACTION = "targetAction"; + + public static final String COL_TYPE = "type"; + + public static final String COL_ENABLE = "enable"; + + public static final String COL_SYSTEMDEFAULT = "systemDefault"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java new file mode 100644 index 00000000..63156fd5 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicBusTypePreEntity.java @@ -0,0 +1,161 @@ +package com.glxp.api.entity.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 补单单据类型实体类 + */ +@Data +@TableName(value = "basic_bustype_pre") +public class BasicBusTypePreEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 说明 + */ + @TableField(value = "intro") + private String intro; + + /** + * 单据类型 + */ + @TableField(value = "`action`") + private String action; + + /** + * 转换扫码单序号 + */ + @TableField(value = "`index`") + private Byte index; + + /** + * 往前推移几天(单位:小时) + */ + @TableField(value = "beforeTime") + private Integer beforeTime; + + /** + * 类型 + */ + @TableField(value = "changeType") + private Boolean changeType; + + /** + * 补单默认仓库 + */ + @TableField(value = "defaultInv") + private String defaultInv; + + /** + * 补单默认分库 + */ + @TableField(value = "defaultSubInv") + private String defaultSubInv; + + /** + * 补单当前仓库 + */ + @TableField(value = "locInv") + private String locInv; + + /** + * 补单当前分库 + */ + @TableField(value = "locSubInv") + private String locSubInv; + + /** + * 原单据类型 + */ + @TableField(value = "originAction") + private String originAction; + + /** + * 是否自动补单 + */ + @TableField(value = "changeEnable") + private Byte changeEnable; + + /** + * 是否全量补单 + */ + @TableField(value = "supplementAll") + private Boolean supplementAll; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + public static final String COL_ID = "id"; + + public static final String COL_INTRO = "intro"; + + public static final String COL_ACTION = "action"; + + public static final String COL_INDEX = "index"; + + public static final String COL_BEFORETIME = "beforeTime"; + + public static final String COL_CHANGETYPE = "changeType"; + + public static final String COL_DEFAULTINV = "defaultInv"; + + public static final String COL_DEFAULTSUBINV = "defaultSubInv"; + + public static final String COL_LOCINV = "locInv"; + + public static final String COL_LOCSUBINV = "locSubInv"; + + public static final String COL_ORIGINACTION = "originAction"; + + public static final String COL_CHANGEENABLE = "changeEnable"; + + public static final String COL_SUPPLEMENTALL = "supplementAll"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java new file mode 100644 index 00000000..8bc0a7f3 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -0,0 +1,276 @@ +package com.glxp.api.entity.basic; + +import lombok.Data; + +import java.util.Date; + +/** + * 单据类型实体类 + */ +@Data +public class BasicBussinessTypeEntity { + /** + * id + */ + private Integer id; + + /** + * 主类型（出库，入库） + */ + private String mainAction; + + /** + * 业务类型 + */ + private String action; + + /** + * 业务名称 + */ + private String name; + + /** + * 是否启用 + */ + private Boolean enable; + + /** + * 备注 + */ + private String remark; + + /** + * 第三方系统外键 + */ + private String thirdSysFk; + + /** + * 是否自动生成往来单位：1.是；2.否 + */ + private Boolean genUnit; + + /** + * 是否是内部单据：1.是；0：否 + */ + private Boolean innerOrder; + + /** + * 是否二次验收 + */ + private Boolean secCheckEnable; + + /** + * 是否根据业务单据类型校验 + */ + private Boolean checkEnable; + + /** + * UDIMS平台来源是否需要校验 + */ + private Boolean checkUdims; + + /** + * pda已校验单据 + */ + private Boolean checkPdaEd; + + /** + * pda未检验单据 + */ + private Boolean checkPdaUn; + + /** + * PC端扫码精灵 + */ + private Boolean checkPc; + + /** + * web前端页面新增单据 + */ + private Boolean checkWebNew; + + /** + * 供应商平台导出单据 + */ + private Boolean checkSp; + + /** + * 流转生成单据 + */ + private Boolean checkChange; + + /** + * UDIMS平台单据 二次校验 + */ + private Boolean secCheckUdims; + + /** + * 手持终端已校验单据 二次校验 + */ + private Boolean secCheckPdaEd; + + /** + * 手持终端未校验单据 二次校验 + */ + private Boolean secCheckPdaUn; + + /** + * UDI扫码通 二次校验 + */ + private Boolean secCheckPc; + + /** + * web端新增单据 二次复核 + */ + private Boolean secCheckWebNew; + + /** + * 自动补单二次复核 + */ + private Boolean secCheckChange; + + /** + * 供应商平台导出单据 + */ + private Boolean secCheckSp; + + /** + * 往来单位类型 + */ + private Boolean corpType; + + /** + * 补单扫码单据类型 + */ + private String supplementOrderType; + + /** + * 平衡补单是否校验 + */ + private Boolean checkBalance; + + /** + * 平衡补单是否二次验收 + */ + private Boolean secCheckBalance; + + /** + * 允许科室多次使用出库 + */ + private Boolean useDyCount; + + /** + * 到期提示 + */ + private Boolean expireTip; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 默认往来单位 + */ + private String defaultUnit; + + /** + * 创建单据前缀 + */ + private String prefix; + + /** + * 出库是否直接上传至自助平台 + */ + private Boolean outToSpms; + + /** + * 允许出库自动缺量补单 + */ + private Boolean ullageFill; + + /** + * 是否只采集预验收产品 + */ + private Boolean scanPreIn; + + /** + * 是否访问库存 + */ + private Boolean vailInv; + + /** + * 允许验收自助平台单据 + */ + private Boolean entrutSpms; + + /** + * 是否强制三期校验 + */ + private Boolean codeFillCheck; + + /** + * 默认分库 + */ + private String defaultSubInv; + + /** + * 默认仓库 + */ + private String defaultInv; + + /** + * 订单详情展示方式：0：根据批次号展示，1:根据条码展示 + */ + private Boolean orderVisibleType; + + /** + * 是否校验复制单据 + */ + private Boolean checkCopy; + + /** + * 是否二次校验复制单据 + */ + private Boolean secCheckCopy; + + /** + * 第三方系统单据类型 + */ + private String originAction; + + /** + * 是否预入库 + */ + private Boolean advanceType; + + /** + * 是否流转 + */ + private Boolean changeEnable; + + /** + * 是否供应商使用 + */ + private Boolean spUse; + + /** + * 是否预验收单据类型 + */ + private Boolean preIn; + + /** + * 缺量补单是否全量补单 + */ + private Boolean supplementAll; + + /** + * 创建人 + */ + private String createUser; + + /** + * 创建时间 + */ + private Date createTime; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java new file mode 100644 index 00000000..b0e4a038 --- /dev/null +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrBusTypeOriginEntity.java @@ -0,0 +1,113 @@ +package com.glxp.api.entity.thrsys; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.util.Date; + +/** + * 第三方单据类型表 + */ +@Data +@TableName(value = "thr_bustype_origin") +public class ThrBusTypeOriginEntity { + + /** + * id + */ + @TableId(value = "id", type = IdType.INPUT) + private Integer id; + + /** + * 单据类型名称 + */ + @TableField(value = "`name`") + private String name; + + /** + * 单据类型编码 + */ + @TableField(value = "`action`") + private String action; + + /** + * 第三方系统标识 + */ + @TableField(value = "thirdSys") + private String thirdSys; + + /** + * 第三方系统名称 + */ + @TableField(value = "thirdSysName") + private String thirdSysName; + + /** + * 0:启用；1:禁用 + */ + @TableField(value = "`enable`") + private Boolean enable; + + /** + * 出入库类型 + */ + @TableField(value = "inoutType") + private Integer inoutType; + + /** + * 更新时间 + */ + @TableField(value = "updateTime") + private Date updateTime; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; + + /** + * 创建人 + */ + @TableField(value = "`createUser`") + private String createUser; + + /** + * 更新人 + */ + @TableField(value = "updateUser") + private String updateUser; + + /** + * 创建时间 + */ + @TableField(value = "createTime") + private Date createTime; + + public static final String COL_ID = "id"; + + public static final String COL_NAME = "name"; + + public static final String COL_ACTION = "action"; + + public static final String COL_THIRDSYS = "thirdSys"; + + public static final String COL_THIRDSYSNAME = "thirdSysName"; + + public static final String COL_ENABLE = "enable"; + + public static final String COL_INOUTTYPE = "inoutType"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; + + public static final String COL_CREATEUSER = "createUser"; + + public static final String COL_UPDATEUSER = "updateUser"; + + public static final String COL_CREATETIME = "createTime"; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java new file mode 100644 index 00000000..86db84a7 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/FilterBussinessTypeRequest.java @@ -0,0 +1,107 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +/** + * 单据类型查询参数 + */ +@Data +public class FilterBussinessTypeRequest extends ListPageRequest { + + /** + * 是否启用 + */ + private Boolean enable; + + /** + * 单据类型编码 + */ + private String action; + + /** + * 第三方单据类型编码 + */ + private String thirdAction; + + /** + * 单据类型名称 + */ + private String name; + + /** + * 主类型（出库，入库） + */ + private String mainAction; + + /** + * 是否启用 + */ + private Boolean enabled; + + /** + * 是否二次验收 + */ + private Boolean checkEnable; + + /** + * 是否预入库 + */ + private Boolean advanceType; + + private String type; + + /** + * 是否供应商使用 + */ + private Boolean spUse; + + /** + * 是否二次验收 + */ + private Boolean secCheckEnable; + + /** + * 仓库用户关联单据类型用户ID + */ + private Integer userId; + + /** + * 仓库编码，用于关联查询仓库关联单据类型 + */ + private String locInvCode; + + /** + * 分库编码，用于关联查询仓库关联单据类型 + */ + private String locSubInvCode; + + /** + * 最近一次更新时间 + */ + private String lastUpdateTime; + + /** + * 仓库关联单据类型的仓库编码 + */ + private String code; + + /** + * 单据类型ID集合 + */ + private String ids; + + /** + * 单据类型编码集合 + */ + private List actionList; + + /** + * 是否预验收单据类型 + */ + private Boolean preIn; + + +} diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java new file mode 100644 index 00000000..df60f3ea --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -0,0 +1,10 @@ +package com.glxp.api.res.basic; + +import lombok.Data; + +/** + * 单据类型响应VO + */ +@Data +public class BasicBussinessTypeResponse { +} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java new file mode 100644 index 00000000..d3e1c914 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java @@ -0,0 +1,7 @@ +package com.glxp.api.service.basic; + +/** + * 单据转换设置Service + */ +public interface IBasicBusTypeChangeService { +} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java new file mode 100644 index 00000000..9b3a8809 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypePreService.java @@ -0,0 +1,7 @@ +package com.glxp.api.service.basic; + +/** + * 补单单据类型Service + */ +public interface IBasicBusTypePreService { +} diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java new file mode 100644 index 00000000..3b7ad12e --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/IBasicBussinessTypeService.java @@ -0,0 +1,7 @@ +package com.glxp.api.service.basic; + +/** + * 单据类型Service + */ +public interface IBasicBussinessTypeService { +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java new file mode 100644 index 00000000..6e026289 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.basic.impl; + +import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class BasicBusTypeChangeServiceImpl implements IBasicBusTypeChangeService { +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java new file mode 100644 index 00000000..72b68665 --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypePreServiceImpl.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.basic.impl; + +import com.glxp.api.service.basic.IBasicBusTypePreService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class BasicBusTypePreServiceImpl implements IBasicBusTypePreService { +} diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java new file mode 100644 index 00000000..249077fe --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -0,0 +1,17 @@ +package com.glxp.api.service.basic.impl; + +import com.glxp.api.dao.basic.BasicBussinessTypeDao; +import com.glxp.api.service.basic.IBasicBussinessTypeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Slf4j +@Service +public class BasicBussinessTypeServiceImpl implements IBasicBussinessTypeService { + + @Resource + private BasicBussinessTypeDao basicBussinessTypeDao; + +} diff --git a/src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java b/src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java new file mode 100644 index 00000000..2c21072f --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/IThrBusTypeOriginService.java @@ -0,0 +1,7 @@ +package com.glxp.api.service.thrsys; + +/** + * 第三方单据类型Service + */ +public interface IThrBusTypeOriginService { +} diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java new file mode 100644 index 00000000..00e65df2 --- /dev/null +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrBusTypeOriginServiceImpl.java @@ -0,0 +1,12 @@ +package com.glxp.api.service.thrsys.impl; + +import com.glxp.api.service.thrsys.IThrBusTypeOriginService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@Transactional(rollbackFor = Exception.class) +public class ThrBusTypeOriginServiceImpl implements IThrBusTypeOriginService { +} diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml new file mode 100644 index 00000000..cfc049d3 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypeChangeDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml new file mode 100644 index 00000000..f5b8e000 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicBusTypePreDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml new file mode 100644 index 00000000..72007828 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml new file mode 100644 index 00000000..bbaae311 --- /dev/null +++ b/src/main/resources/mybatis/mapper/thrsys/ThrBusTypeOriginDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file