From ad00cbf62b63c6eccab059af574a10eee5fa42dd Mon Sep 17 00:00:00 2001 From: "maxw@mesnac.com" Date: Mon, 6 Jan 2025 10:09:09 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=96=B0=E5=A2=9E=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/hwmom-wms/pom.xml | 154 ++++++++++++++++++ .../org/dromara/wms/HwMomWmsApplication.java | 22 +++ .../WmsConfigurationController.java | 106 ++++++++++++ .../dromara/wms/domain/WmsConfiguration.java | 90 ++++++++++ .../wms/domain/bo/WmsConfigurationBo.java | 77 +++++++++ .../wms/domain/vo/WmsConfigurationVo.java | 104 ++++++++++++ .../wms/mapper/WmsConfigurationMapper.java | 21 +++ .../wms/service/IWmsConfigurationService.java | 68 ++++++++ .../impl/WmsConfigurationServiceImpl.java | 138 ++++++++++++++++ .../mapper/wms/WmsConfigurationMapper.xml | 29 ++++ ruoyi-modules/pom.xml | 1 + ruoyi-visual/ruoyi-seata-server/pom.xml | 2 +- 12 files changed, 811 insertions(+), 1 deletion(-) create mode 100644 ruoyi-modules/hwmom-wms/pom.xml create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/HwMomWmsApplication.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsConfiguration.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsConfigurationBo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsConfigurationVo.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsConfigurationMapper.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsConfigurationService.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsConfigurationMapper.xml diff --git a/ruoyi-modules/hwmom-wms/pom.xml b/ruoyi-modules/hwmom-wms/pom.xml new file mode 100644 index 0000000..402d431 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/pom.xml @@ -0,0 +1,154 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + hwmom-wms + + + hwmom-wms仓储模块 + + + + + + org.dromara + ruoyi-common-nacos + + + + org.dromara + ruoyi-common-sentinel + + + + + org.dromara + ruoyi-common-log + + + + org.dromara + ruoyi-common-dict + + + + org.dromara + ruoyi-common-doc + + + + org.dromara + ruoyi-common-web + + + + org.dromara + ruoyi-common-mybatis + + + + org.dromara + ruoyi-common-dubbo + + + + org.dromara + ruoyi-common-seata + + + + org.dromara + ruoyi-common-idempotent + + + + org.dromara + ruoyi-common-tenant + + + + org.dromara + ruoyi-common-security + + + + org.dromara + ruoyi-common-translation + + + + org.dromara + ruoyi-common-sensitive + + + + org.dromara + ruoyi-common-encrypt + + + + + org.dromara + ruoyi-api-system + + + + org.dromara + ruoyi-api-resource + + + + + + + com.microsoft.sqlserver + mssql-jdbc + + + + + + + + + + + + + + + + ${project.artifactId} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/HwMomWmsApplication.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/HwMomWmsApplication.java new file mode 100644 index 0000000..f358ac6 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/HwMomWmsApplication.java @@ -0,0 +1,22 @@ +package org.dromara.wms; + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; + +/** + * 系统模块 + * + * @author ruoyi + */ +@EnableDubbo +@SpringBootApplication +public class HwMomWmsApplication { + public static void main(String[] args) { + SpringApplication application = new SpringApplication(HwMomWmsApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ﾉﾞ 仓储模块启动成功 ლ(´ڡ`ლ)ﾞ "); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java new file mode 100644 index 0000000..e273d94 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsConfigurationController.java @@ -0,0 +1,106 @@ +package org.dromara.wms.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.dromara.wms.domain.bo.WmsConfigurationBo; +import org.dromara.wms.domain.vo.WmsConfigurationVo; +import org.dromara.wms.service.IWmsConfigurationService; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 仓库模块配置 + * 前端访问路由地址为:/system/configuration + * + * @author LionLi + * @date 2025-01-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/configuration") +public class WmsConfigurationController extends BaseController { + + private final IWmsConfigurationService wmsConfigurationService; + + /** + * 查询仓库模块配置列表 + */ + @SaCheckPermission("system:configuration:list") + @GetMapping("/list") + public TableDataInfo list(WmsConfigurationBo bo, PageQuery pageQuery) { + return wmsConfigurationService.queryPageList(bo, pageQuery); + } + + /** + * 导出仓库模块配置列表 + */ + @SaCheckPermission("system:configuration:export") + @Log(title = "仓库模块配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsConfigurationBo bo, HttpServletResponse response) { + List list = wmsConfigurationService.queryList(bo); + ExcelUtil.exportExcel(list, "仓库模块配置", WmsConfigurationVo.class, response); + } + + /** + * 获取仓库模块配置详细信息 + * + * @param configurationId 主键 + */ + @SaCheckPermission("system:configuration:query") + @GetMapping("/{configurationId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long configurationId) { + return R.ok(wmsConfigurationService.queryById(configurationId)); + } + + /** + * 新增仓库模块配置 + */ + @SaCheckPermission("system:configuration:add") + @Log(title = "仓库模块配置", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsConfigurationBo bo) { + return toAjax(wmsConfigurationService.insertByBo(bo)); + } + + /** + * 修改仓库模块配置 + */ + @SaCheckPermission("system:configuration:edit") + @Log(title = "仓库模块配置", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsConfigurationBo bo) { + return toAjax(wmsConfigurationService.updateByBo(bo)); + } + + /** + * 删除仓库模块配置 + * + * @param configurationIds 主键串 + */ + @SaCheckPermission("system:configuration:remove") + @Log(title = "仓库模块配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{configurationIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] configurationIds) { + return toAjax(wmsConfigurationService.deleteWithValidByIds(List.of(configurationIds), true)); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsConfiguration.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsConfiguration.java new file mode 100644 index 0000000..e7bff38 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsConfiguration.java @@ -0,0 +1,90 @@ +package org.dromara.wms.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; +import java.util.Date; + +/** + * 仓库模块配置对象 wms_configuration + * + * @author LionLi + * @date 2025-01-03 + */ +@Data +@TableName("wms_configuration") +public class WmsConfiguration { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + private Long configurationId; + + /** + * 节点代码 + */ + private String nodeCode; + + /** + * 节点名称 + */ + private String nodeName; + + /** + * 审批是否 + */ + private String approveYesNo; + + /** + * 审批类型（0人员审批，1角色审批，2流程审批） + */ + private String approveType; + + /** + * 审批代码 + */ + private String approveRoleCode; + + /** + * 仓库ID + */ + private Long warehouseId; + + /** + * 审批范围（0所有仓库，1仓库） + */ + private String approveRange; + + /** + * 租户id + */ + private int tenantId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsConfigurationBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsConfigurationBo.java new file mode 100644 index 0000000..b5b6e4d --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsConfigurationBo.java @@ -0,0 +1,77 @@ +package org.dromara.wms.domain.bo; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import org.dromara.wms.domain.WmsConfiguration; + +/** + * 仓库模块配置业务对象 wms_configuration + * + * @author LionLi + * @date 2025-01-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = WmsConfiguration.class, reverseConvertGenerate = false) +public class WmsConfigurationBo extends BaseEntity { + + /** + * 表主键 + */ +// @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long configurationId; + + /** + * 节点代码 + */ + @NotBlank(message = "节点代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String nodeCode; + + /** + * 节点名称 + */ + @NotBlank(message = "节点名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String nodeName; + + /** + * 审批是否 + */ + @NotBlank(message = "审批是否不能为空", groups = { AddGroup.class, EditGroup.class }) + private String approveYesNo; + + /** + * 审批类型（0人员审批，1角色审批，2流程审批） + */ + @NotBlank(message = "审批类型（0人员审批，1角色审批，2流程审批）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String approveType; + + /** + * 审批代码 + */ + @NotBlank(message = "审批代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String approveRoleCode; + + /** + * 仓库ID + */ + @NotNull(message = "仓库ID不能为空", groups = { AddGroup.class, EditGroup.class }) + private Long warehouseId; + + /** + * 审批范围（0所有仓库，1仓库） + */ + @NotBlank(message = "审批范围（0所有仓库，1仓库）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String approveRange; + + /** + * 租户id + */ + private int tenantId; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsConfigurationVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsConfigurationVo.java new file mode 100644 index 0000000..fb194fe --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsConfigurationVo.java @@ -0,0 +1,104 @@ +package org.dromara.wms.domain.vo; + +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import org.dromara.wms.domain.WmsConfiguration; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 仓库模块配置视图对象 wms_configuration + * + * @author LionLi + * @date 2025-01-03 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = WmsConfiguration.class) +public class WmsConfigurationVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 表主键 + */ + @ExcelProperty(value = "表主键") + private Long configurationId; + + /** + * 节点代码 + */ + @ExcelProperty(value = "节点代码") + private String nodeCode; + + /** + * 节点名称 + */ + @ExcelProperty(value = "节点名称") + private String nodeName; + + /** + * 审批是否 + */ + @ExcelProperty(value = "审批是否") + private String approveYesNo; + + /** + * 审批类型（0人员审批，1角色审批，2流程审批） + */ + @ExcelProperty(value = "审批类型", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=人员审批，1角色审批，2流程审批") + private String approveType; + + /** + * 审批代码 + */ + @ExcelProperty(value = "审批代码") + private String approveRoleCode; + + /** + * 仓库ID + */ + @ExcelProperty(value = "仓库ID") + private Long warehouseId; + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private Date updateTime; + + /** + * 审批范围（0所有仓库，1仓库） + */ + @ExcelProperty(value = "审批范围", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "0=所有仓库，1仓库") + private String approveRange; + + +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsConfigurationMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsConfigurationMapper.java new file mode 100644 index 0000000..2c21a91 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsConfigurationMapper.java @@ -0,0 +1,21 @@ +package org.dromara.wms.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.wms.domain.WmsConfiguration; +import org.dromara.wms.domain.vo.WmsConfigurationVo; + +/** + * 仓库模块配置Mapper接口 + * + * @author LionLi + * @date 2025-01-03 + */ +@Mapper +public interface WmsConfigurationMapper extends BaseMapperPlus { + + int insertConfiguration(@Param("entity") WmsConfiguration entity); + + int selectNum(); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsConfigurationService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsConfigurationService.java new file mode 100644 index 0000000..8df00ea --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsConfigurationService.java @@ -0,0 +1,68 @@ +package org.dromara.wms.service; + +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.wms.domain.bo.WmsConfigurationBo; +import org.dromara.wms.domain.vo.WmsConfigurationVo; + +import java.util.Collection; +import java.util.List; + +/** + * 仓库模块配置Service接口 + * + * @author LionLi + * @date 2025-01-03 + */ +public interface IWmsConfigurationService { + + /** + * 查询仓库模块配置 + * + * @param configurationId 主键 + * @return 仓库模块配置 + */ + WmsConfigurationVo queryById(Long configurationId); + + /** + * 分页查询仓库模块配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 仓库模块配置分页列表 + */ + TableDataInfo queryPageList(WmsConfigurationBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的仓库模块配置列表 + * + * @param bo 查询条件 + * @return 仓库模块配置列表 + */ + List queryList(WmsConfigurationBo bo); + + /** + * 新增仓库模块配置 + * + * @param bo 仓库模块配置 + * @return 是否新增成功 + */ + Boolean insertByBo(WmsConfigurationBo bo); + + /** + * 修改仓库模块配置 + * + * @param bo 仓库模块配置 + * @return 是否修改成功 + */ + Boolean updateByBo(WmsConfigurationBo bo); + + /** + * 校验并批量删除仓库模块配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java new file mode 100644 index 0000000..036eb4e --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsConfigurationServiceImpl.java @@ -0,0 +1,138 @@ +package org.dromara.wms.service.impl; + +import net.sf.jsqlparser.statement.Statements; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.wms.domain.WmsConfiguration; +import org.dromara.wms.domain.bo.WmsConfigurationBo; +import org.dromara.wms.domain.vo.WmsConfigurationVo; +import org.dromara.wms.mapper.WmsConfigurationMapper; +import org.dromara.wms.service.IWmsConfigurationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 仓库模块配置Service业务层处理 + * + * @author LionLi + * @date 2025-01-03 + */ +@RequiredArgsConstructor +@Service +public class WmsConfigurationServiceImpl implements IWmsConfigurationService { + @Autowired + private final WmsConfigurationMapper baseMapper; + + /** + * 查询仓库模块配置 + * + * @param configurationId 主键 + * @return 仓库模块配置 + */ + @Override + public WmsConfigurationVo queryById(Long configurationId){ + return baseMapper.selectVoById(configurationId); + } + + /** + * 分页查询仓库模块配置列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 仓库模块配置分页列表 + */ + @Override + public TableDataInfo queryPageList(WmsConfigurationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.orderByDesc(WmsConfiguration::getCreateTime); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的仓库模块配置列表 + * + * @param bo 查询条件 + * @return 仓库模块配置列表 + */ + @Override + public List queryList(WmsConfigurationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsConfigurationBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getConfigurationId() != null, WmsConfiguration::getConfigurationId, bo.getConfigurationId()); + lqw.eq(StringUtils.isNotBlank(bo.getNodeCode()), WmsConfiguration::getNodeCode, bo.getNodeCode()); + lqw.like(StringUtils.isNotBlank(bo.getNodeName()), WmsConfiguration::getNodeName, bo.getNodeName()); + lqw.eq(StringUtils.isNotBlank(bo.getApproveYesNo()), WmsConfiguration::getApproveYesNo, bo.getApproveYesNo()); + lqw.eq(StringUtils.isNotBlank(bo.getApproveType()), WmsConfiguration::getApproveType, bo.getApproveType()); + lqw.eq(StringUtils.isNotBlank(bo.getApproveRoleCode()), WmsConfiguration::getApproveRoleCode, bo.getApproveRoleCode()); + lqw.eq(bo.getWarehouseId() != null, WmsConfiguration::getWarehouseId, bo.getWarehouseId()); + lqw.eq(StringUtils.isNotBlank(bo.getApproveRange()), WmsConfiguration::getApproveRange, bo.getApproveRange()); + return lqw; + } + + /** + * 新增仓库模块配置 + * + * @param bo 仓库模块配置 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(WmsConfigurationBo bo) { + WmsConfiguration add = MapstructUtils.convert(bo, WmsConfiguration.class); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setConfigurationId(add.getConfigurationId()); + } + return flag; + } + + /** + * 修改仓库模块配置 + * + * @param bo 仓库模块配置 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(WmsConfigurationBo bo) { + WmsConfiguration update = MapstructUtils.convert(bo, WmsConfiguration.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsConfiguration entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除仓库模块配置信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsConfigurationMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsConfigurationMapper.xml new file mode 100644 index 0000000..62f9a57 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsConfigurationMapper.xml @@ -0,0 +1,29 @@ + + + + + + + INSERT + INTO + wms_configuration (node_code, + node_name, + approve_yes_no, + approve_type, + approve_role_code, + warehouse_id, + approve_range, + tenant_id, + create_by, + create_time, + update_by, + update_time) + VALUES (#{entity.nodeCode},(#{entity.nodeName},(#{entity.approveYesNo},(#{entity.approveType},(#{entity.approveRoleCode},(#{entity.warehouseId},(#{entity.approveRange},(#{entity.tenantId}, + (#{entity.createBy},(#{entity.createTime},(#{entity.updateBy},(#{entity.updateTime}) + + + diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 0500070..303665f 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -15,6 +15,7 @@ ruoyi-resource ruoyi-workflow hwmom-mes + hwmom-wms ruoyi-modules diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/ruoyi-visual/ruoyi-seata-server/pom.xml index 727f670..f59406e 100644 --- a/ruoyi-visual/ruoyi-seata-server/pom.xml +++ b/ruoyi-visual/ruoyi-seata-server/pom.xml @@ -27,7 +27,7 @@ jar - 1.7.1 + 2.0.0 2.7.18 7.2 3.8.0