feat(wms): 添加钢卷质量改判记录管理功能
- 创建 WmsCoilQualityRejudge 实体类定义数据库表结构 - 实现 IWmsCoilQualityRejudgeService 接口及其实现类 - 开发 WmsCoilQualityRejudgeController 控制器提供 REST API - 添加 WmsCoilQualityRejudgeMapper 数据访问层接口 - 配置 MyBatis XML 映射文件实现数据库操作 - 定义 WmsCoilQualityRejudgeBo 业务对象和 Vo 视图对象 - 实现分页查询、新增、修改、删除等基础 CRUD 功能 - 集成 Excel 导出功能支持数据批量导出 - 添加数据验证和业务逻辑处理机制
This commit is contained in:
@@ -0,0 +1,99 @@
|
||||
package com.klp.controller;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.constraints.*;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import com.klp.common.annotation.RepeatSubmit;
|
||||
import com.klp.common.annotation.Log;
|
||||
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.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.vo.WmsCoilQualityRejudgeVo;
|
||||
import com.klp.domain.bo.WmsCoilQualityRejudgeBo;
|
||||
import com.klp.service.IWmsCoilQualityRejudgeService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 钢卷质量改判记录
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-04-20
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/wms/coilQualityRejudge")
|
||||
public class WmsCoilQualityRejudgeController extends BaseController {
|
||||
|
||||
private final IWmsCoilQualityRejudgeService iWmsCoilQualityRejudgeService;
|
||||
|
||||
/**
|
||||
* 查询钢卷质量改判记录列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsCoilQualityRejudgeVo> list(WmsCoilQualityRejudgeBo bo, PageQuery pageQuery) {
|
||||
return iWmsCoilQualityRejudgeService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出钢卷质量改判记录列表
|
||||
*/
|
||||
@Log(title = "钢卷质量改判记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsCoilQualityRejudgeBo bo, HttpServletResponse response) {
|
||||
List<WmsCoilQualityRejudgeVo> list = iWmsCoilQualityRejudgeService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "钢卷质量改判记录", WmsCoilQualityRejudgeVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取钢卷质量改判记录详细信息
|
||||
*
|
||||
* @param rejudgeId 主键
|
||||
*/
|
||||
@GetMapping("/{rejudgeId}")
|
||||
public R<WmsCoilQualityRejudgeVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long rejudgeId) {
|
||||
return R.ok(iWmsCoilQualityRejudgeService.queryById(rejudgeId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增钢卷质量改判记录
|
||||
*/
|
||||
@Log(title = "钢卷质量改判记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCoilQualityRejudgeBo bo) {
|
||||
return toAjax(iWmsCoilQualityRejudgeService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改钢卷质量改判记录
|
||||
*/
|
||||
@Log(title = "钢卷质量改判记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsCoilQualityRejudgeBo bo) {
|
||||
return toAjax(iWmsCoilQualityRejudgeService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除钢卷质量改判记录
|
||||
*
|
||||
* @param rejudgeIds 主键串
|
||||
*/
|
||||
@Log(title = "钢卷质量改判记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{rejudgeIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] rejudgeIds) {
|
||||
return toAjax(iWmsCoilQualityRejudgeService.deleteWithValidByIds(Arrays.asList(rejudgeIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.klp.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
/**
|
||||
* 钢卷质量改判记录对象 wms_coil_quality_rejudge
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-04-20
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_coil_quality_rejudge")
|
||||
public class WmsCoilQualityRejudge extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 改判记录主键ID
|
||||
*/
|
||||
@TableId(value = "rejudge_id")
|
||||
private Long rejudgeId;
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
/**
|
||||
* 改判前质量状态
|
||||
*/
|
||||
private String beforeQuality;
|
||||
/**
|
||||
* 改判后质量状态
|
||||
*/
|
||||
private String afterQuality;
|
||||
/**
|
||||
* 改判原因
|
||||
*/
|
||||
private String rejudgeReason;
|
||||
/**
|
||||
* 删除标志(0=存在 2=删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private String delFlag;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
package com.klp.domain.bo;
|
||||
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import javax.validation.constraints.*;
|
||||
|
||||
|
||||
/**
|
||||
* 钢卷质量改判记录业务对象 wms_coil_quality_rejudge
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-04-20
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsCoilQualityRejudgeBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 改判记录主键ID
|
||||
*/
|
||||
private Long rejudgeId;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 改判前质量状态
|
||||
*/
|
||||
private String beforeQuality;
|
||||
|
||||
/**
|
||||
* 改判后质量状态
|
||||
*/
|
||||
private String afterQuality;
|
||||
|
||||
/**
|
||||
* 改判原因
|
||||
*/
|
||||
private String rejudgeReason;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package com.klp.domain.vo;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* 钢卷质量改判记录视图对象 wms_coil_quality_rejudge
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-04-20
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsCoilQualityRejudgeVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 改判记录主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "改判记录主键ID")
|
||||
private Long rejudgeId;
|
||||
|
||||
/**
|
||||
* 钢卷ID
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷ID")
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 改判前质量状态
|
||||
*/
|
||||
@ExcelProperty(value = "改判前质量状态")
|
||||
private String beforeQuality;
|
||||
|
||||
/**
|
||||
* 改判后质量状态
|
||||
*/
|
||||
@ExcelProperty(value = "改判后质量状态")
|
||||
private String afterQuality;
|
||||
|
||||
/**
|
||||
* 改判原因
|
||||
*/
|
||||
@ExcelProperty(value = "改判原因")
|
||||
private String rejudgeReason;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.klp.domain.WmsCoilQualityRejudge;
|
||||
import com.klp.domain.vo.WmsCoilQualityRejudgeVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 钢卷质量改判记录Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-04-20
|
||||
*/
|
||||
public interface WmsCoilQualityRejudgeMapper extends BaseMapperPlus<WmsCoilQualityRejudgeMapper, WmsCoilQualityRejudge, WmsCoilQualityRejudgeVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsCoilQualityRejudge;
|
||||
import com.klp.domain.vo.WmsCoilQualityRejudgeVo;
|
||||
import com.klp.domain.bo.WmsCoilQualityRejudgeBo;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 钢卷质量改判记录Service接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-04-20
|
||||
*/
|
||||
public interface IWmsCoilQualityRejudgeService {
|
||||
|
||||
/**
|
||||
* 查询钢卷质量改判记录
|
||||
*/
|
||||
WmsCoilQualityRejudgeVo queryById(Long rejudgeId);
|
||||
|
||||
/**
|
||||
* 查询钢卷质量改判记录列表
|
||||
*/
|
||||
TableDataInfo<WmsCoilQualityRejudgeVo> queryPageList(WmsCoilQualityRejudgeBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询钢卷质量改判记录列表
|
||||
*/
|
||||
List<WmsCoilQualityRejudgeVo> queryList(WmsCoilQualityRejudgeBo bo);
|
||||
|
||||
/**
|
||||
* 新增钢卷质量改判记录
|
||||
*/
|
||||
Boolean insertByBo(WmsCoilQualityRejudgeBo bo);
|
||||
|
||||
/**
|
||||
* 修改钢卷质量改判记录
|
||||
*/
|
||||
Boolean updateByBo(WmsCoilQualityRejudgeBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除钢卷质量改判记录信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.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 com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsCoilQualityRejudgeBo;
|
||||
import com.klp.domain.vo.WmsCoilQualityRejudgeVo;
|
||||
import com.klp.domain.WmsCoilQualityRejudge;
|
||||
import com.klp.mapper.WmsCoilQualityRejudgeMapper;
|
||||
import com.klp.service.IWmsCoilQualityRejudgeService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 钢卷质量改判记录Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-04-20
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsCoilQualityRejudgeServiceImpl implements IWmsCoilQualityRejudgeService {
|
||||
|
||||
private final WmsCoilQualityRejudgeMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询钢卷质量改判记录
|
||||
*/
|
||||
@Override
|
||||
public WmsCoilQualityRejudgeVo queryById(Long rejudgeId){
|
||||
return baseMapper.selectVoById(rejudgeId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询钢卷质量改判记录列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsCoilQualityRejudgeVo> queryPageList(WmsCoilQualityRejudgeBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsCoilQualityRejudge> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsCoilQualityRejudgeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询钢卷质量改判记录列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsCoilQualityRejudgeVo> queryList(WmsCoilQualityRejudgeBo bo) {
|
||||
LambdaQueryWrapper<WmsCoilQualityRejudge> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsCoilQualityRejudge> buildQueryWrapper(WmsCoilQualityRejudgeBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsCoilQualityRejudge> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getCoilId() != null, WmsCoilQualityRejudge::getCoilId, bo.getCoilId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getBeforeQuality()), WmsCoilQualityRejudge::getBeforeQuality, bo.getBeforeQuality());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getAfterQuality()), WmsCoilQualityRejudge::getAfterQuality, bo.getAfterQuality());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getRejudgeReason()), WmsCoilQualityRejudge::getRejudgeReason, bo.getRejudgeReason());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增钢卷质量改判记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsCoilQualityRejudgeBo bo) {
|
||||
WmsCoilQualityRejudge add = BeanUtil.toBean(bo, WmsCoilQualityRejudge.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setRejudgeId(add.getRejudgeId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改钢卷质量改判记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsCoilQualityRejudgeBo bo) {
|
||||
WmsCoilQualityRejudge update = BeanUtil.toBean(bo, WmsCoilQualityRejudge.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsCoilQualityRejudge entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除钢卷质量改判记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
<?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.WmsCoilQualityRejudgeMapper">
|
||||
|
||||
<resultMap type="com.klp.domain.WmsCoilQualityRejudge" id="WmsCoilQualityRejudgeResult">
|
||||
<result property="rejudgeId" column="rejudge_id"/>
|
||||
<result property="coilId" column="coil_id"/>
|
||||
<result property="beforeQuality" column="before_quality"/>
|
||||
<result property="afterQuality" column="after_quality"/>
|
||||
<result property="rejudgeReason" column="rejudge_reason"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<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