feat(wms): 规程主表 wms_process_spec 全栈 CRUD（任务2）
新增规程档案后端（Entity/BO/VO/Mapper/Service/Controller），接口前缀 /wms/processSpec， 含分页查询、导出、详情、增删改；保存时校验规程编号唯一；逻辑删除与全局配置一致（0 未删 / 2 已删）。 新增 Flyway 脚本 V10 建表及唯一索引；前端增加 api/wms/processSpec.js 与 views/wms/processSpec/index.vue， 支持按编号/名称/类型/产线/产品类型/启用状态筛选，产线下拉关联现有产线接口。 说明：需在目标库执行迁移并在菜单中配置组件路径 wms/processSpec/index。
This commit is contained in:
王文昊
@@ -0,0 +1,99 @@
|
||||
package com.klp.controller;
|
||||
|
||||
import com.klp.common.annotation.Log;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.core.controller.BaseController;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.domain.bo.WmsProcessSpecBo;
|
||||
import com.klp.domain.vo.WmsProcessSpecVo;
|
||||
import com.klp.service.IWmsProcessSpecService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 规程主表
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/wms/processSpec")
|
||||
public class WmsProcessSpecController extends BaseController {
|
||||
|
||||
private final IWmsProcessSpecService wmsProcessSpecService;
|
||||
|
||||
/**
|
||||
* 查询规程主表列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsProcessSpecVo> list(WmsProcessSpecBo bo, PageQuery pageQuery) {
|
||||
return wmsProcessSpecService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出规程主表列表
|
||||
*/
|
||||
@Log(title = "规程主表", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsProcessSpecBo bo, HttpServletResponse response) {
|
||||
List<WmsProcessSpecVo> list = wmsProcessSpecService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "规程主表", WmsProcessSpecVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取规程主表详细信息
|
||||
*
|
||||
* @param specId 主键
|
||||
*/
|
||||
@GetMapping("/{specId}")
|
||||
public R<WmsProcessSpecVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long specId) {
|
||||
return R.ok(wmsProcessSpecService.queryById(specId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增规程主表
|
||||
*/
|
||||
@Log(title = "规程主表", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsProcessSpecBo bo) {
|
||||
return toAjax(wmsProcessSpecService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改规程主表
|
||||
*/
|
||||
@Log(title = "规程主表", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsProcessSpecBo bo) {
|
||||
return toAjax(wmsProcessSpecService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除规程主表
|
||||
*
|
||||
* @param specIds 主键串
|
||||
*/
|
||||
@Log(title = "规程主表", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{specIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] specIds) {
|
||||
return toAjax(wmsProcessSpecService.deleteWithValidByIds(Arrays.asList(specIds), true));
|
||||
}
|
||||
}
|
||||
68
klp-wms/src/main/java/com/klp/domain/WmsProcessSpec.java
Normal file
68
klp-wms/src/main/java/com/klp/domain/WmsProcessSpec.java
Normal file
@@ -0,0 +1,68 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* 规程主表对象 wms_process_spec
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_process_spec")
|
||||
public class WmsProcessSpec extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(value = "spec_id")
|
||||
private Long specId;
|
||||
|
||||
/**
|
||||
* 规程编号
|
||||
*/
|
||||
private String specCode;
|
||||
|
||||
/**
|
||||
* 规程名称
|
||||
*/
|
||||
private String specName;
|
||||
|
||||
/**
|
||||
* 类型(PROCESS/STANDARD)
|
||||
*/
|
||||
private String specType;
|
||||
|
||||
/**
|
||||
* 产线ID
|
||||
*/
|
||||
private Long lineId;
|
||||
|
||||
/**
|
||||
* 产品类型
|
||||
*/
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 是否启用（0=否，1=是）
|
||||
*/
|
||||
private Integer isEnabled;
|
||||
|
||||
/**
|
||||
* 删除标志（0=正常，2=删除，与全局 logicDeleteValue 一致）
|
||||
*/
|
||||
@TableLogic
|
||||
private Integer delFlag;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.klp.common.core.validate.AddGroup;
|
||||
import com.klp.common.core.validate.EditGroup;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
/**
|
||||
* 规程主表业务对象 wms_process_spec
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsProcessSpecBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
|
||||
private Long specId;
|
||||
|
||||
/**
|
||||
* 规程编号
|
||||
*/
|
||||
@NotBlank(message = "规程编号不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String specCode;
|
||||
|
||||
/**
|
||||
* 规程名称
|
||||
*/
|
||||
@NotBlank(message = "规程名称不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String specName;
|
||||
|
||||
/**
|
||||
* 类型(PROCESS/STANDARD)
|
||||
*/
|
||||
@NotBlank(message = "规程类型不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String specType;
|
||||
|
||||
/**
|
||||
* 产线ID
|
||||
*/
|
||||
@NotNull(message = "产线不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private Long lineId;
|
||||
|
||||
/**
|
||||
* 产品类型
|
||||
*/
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 是否启用（0=否，1=是）
|
||||
*/
|
||||
private Integer isEnabled;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
}
|
||||
@@ -0,0 +1,82 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 规程主表视图对象 wms_process_spec
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsProcessSpecVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ExcelProperty(value = "主键")
|
||||
private Long specId;
|
||||
|
||||
/**
|
||||
* 规程编号
|
||||
*/
|
||||
@ExcelProperty(value = "规程编号")
|
||||
private String specCode;
|
||||
|
||||
/**
|
||||
* 规程名称
|
||||
*/
|
||||
@ExcelProperty(value = "规程名称")
|
||||
private String specName;
|
||||
|
||||
/**
|
||||
* 类型(PROCESS/STANDARD)
|
||||
*/
|
||||
@ExcelProperty(value = "规程类型")
|
||||
private String specType;
|
||||
|
||||
/**
|
||||
* 产线ID
|
||||
*/
|
||||
@ExcelProperty(value = "产线ID")
|
||||
private Long lineId;
|
||||
|
||||
/**
|
||||
* 产品类型
|
||||
*/
|
||||
@ExcelProperty(value = "产品类型")
|
||||
private String productType;
|
||||
|
||||
/**
|
||||
* 是否启用（0=否，1=是）
|
||||
*/
|
||||
@ExcelProperty(value = "是否启用")
|
||||
private Integer isEnabled;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ExcelProperty(value = "创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@ExcelProperty(value = "更新时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
import com.klp.domain.WmsProcessSpec;
|
||||
import com.klp.domain.vo.WmsProcessSpecVo;
|
||||
|
||||
/**
|
||||
* 规程主表Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
public interface WmsProcessSpecMapper extends BaseMapperPlus<WmsProcessSpecMapper, WmsProcessSpec, WmsProcessSpecVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.domain.bo.WmsProcessSpecBo;
|
||||
import com.klp.domain.vo.WmsProcessSpecVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 规程主表Service接口
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
public interface IWmsProcessSpecService {
|
||||
|
||||
/**
|
||||
* 查询规程主表
|
||||
*/
|
||||
WmsProcessSpecVo queryById(Long specId);
|
||||
|
||||
/**
|
||||
* 查询规程主表分页列表
|
||||
*/
|
||||
TableDataInfo<WmsProcessSpecVo> queryPageList(WmsProcessSpecBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询规程主表列表
|
||||
*/
|
||||
List<WmsProcessSpecVo> queryList(WmsProcessSpecBo bo);
|
||||
|
||||
/**
|
||||
* 新增规程主表
|
||||
*/
|
||||
Boolean insertByBo(WmsProcessSpecBo bo);
|
||||
|
||||
/**
|
||||
* 修改规程主表
|
||||
*/
|
||||
Boolean updateByBo(WmsProcessSpecBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除规程主表
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.exception.ServiceException;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.klp.domain.WmsProcessSpec;
|
||||
import com.klp.domain.bo.WmsProcessSpecBo;
|
||||
import com.klp.domain.vo.WmsProcessSpecVo;
|
||||
import com.klp.mapper.WmsProcessSpecMapper;
|
||||
import com.klp.service.IWmsProcessSpecService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 规程主表Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsProcessSpecServiceImpl implements IWmsProcessSpecService {
|
||||
|
||||
private final WmsProcessSpecMapper baseMapper;
|
||||
|
||||
@Override
|
||||
public WmsProcessSpecVo queryById(Long specId) {
|
||||
return baseMapper.selectVoById(specId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TableDataInfo<WmsProcessSpecVo> queryPageList(WmsProcessSpecBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsProcessSpec> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsProcessSpecVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WmsProcessSpecVo> queryList(WmsProcessSpecBo bo) {
|
||||
LambdaQueryWrapper<WmsProcessSpec> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsProcessSpec> buildQueryWrapper(WmsProcessSpecBo bo) {
|
||||
LambdaQueryWrapper<WmsProcessSpec> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecCode()), WmsProcessSpec::getSpecCode, bo.getSpecCode());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getSpecName()), WmsProcessSpec::getSpecName, bo.getSpecName());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getSpecType()), WmsProcessSpec::getSpecType, bo.getSpecType());
|
||||
lqw.eq(bo.getLineId() != null, WmsProcessSpec::getLineId, bo.getLineId());
|
||||
lqw.like(StringUtils.isNotBlank(bo.getProductType()), WmsProcessSpec::getProductType, bo.getProductType());
|
||||
lqw.eq(bo.getIsEnabled() != null, WmsProcessSpec::getIsEnabled, bo.getIsEnabled());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean insertByBo(WmsProcessSpecBo bo) {
|
||||
WmsProcessSpec add = BeanUtil.toBean(bo, WmsProcessSpec.class);
|
||||
if (add.getIsEnabled() == null) {
|
||||
add.setIsEnabled(1);
|
||||
}
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setSpecId(add.getSpecId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateByBo(WmsProcessSpecBo bo) {
|
||||
WmsProcessSpec update = BeanUtil.toBean(bo, WmsProcessSpec.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
private void validEntityBeforeSave(WmsProcessSpec entity) {
|
||||
LambdaQueryWrapper<WmsProcessSpec> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(WmsProcessSpec::getSpecCode, entity.getSpecCode());
|
||||
if (entity.getSpecId() != null) {
|
||||
lqw.ne(WmsProcessSpec::getSpecId, entity.getSpecId());
|
||||
}
|
||||
if (baseMapper.selectCount(lqw) > 0) {
|
||||
throw new ServiceException("规程编号已存在");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if (Boolean.TRUE.equals(isValid)) {
|
||||
// 任务3 可在此校验版本等从表数据
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
<?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.klp.mapper.WmsProcessSpecMapper">
|
||||
|
||||
<resultMap type="com.klp.domain.WmsProcessSpec" id="WmsProcessSpecResult">
|
||||
<result property="specId" column="spec_id"/>
|
||||
<result property="specCode" column="spec_code"/>
|
||||
<result property="specName" column="spec_name"/>
|
||||
<result property="specType" column="spec_type"/>
|
||||
<result property="lineId" column="line_id"/>
|
||||
<result property="productType" column="product_type"/>
|
||||
<result property="isEnabled" column="is_enabled"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="remark" column="remark"/>
|
||||
</resultMap>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user