feat(wms): 添加钢卷质量状态变更记录功能
- 新增 WmsCoilQualityChangeLog 实体类定义数据库表结构 - 创建 WmsCoilQualityChangeLogBo 业务对象用于数据传输 - 创建 WmsCoilQualityChangeLogVo 视图对象用于前端展示 - 实现 IWmsCoilQualityChangeLogService 接口定义业务方法 - 开发 WmsCoilQualityChangeLogServiceImpl 业务逻辑实现类 - 创建 WmsCoilQualityChangeLogMapper 数据访问接口 - 配置 WmsCoilQualityChangeLogMapper.xml 映射文件 - 实现 WmsCoilQualityChangeLogController 控制器提供 REST API - 支持查询、新增、修改、删除和导出钢卷质量状态变更记录 - 添加分页查询和条件筛选功能 - 集成 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.WmsCoilQualityChangeLogVo;
|
||||
import com.klp.domain.bo.WmsCoilQualityChangeLogBo;
|
||||
import com.klp.service.IWmsCoilQualityChangeLogService;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 钢卷质量状态变更记录
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-07-03
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/klp/coilQualityChangeLog")
|
||||
public class WmsCoilQualityChangeLogController extends BaseController {
|
||||
|
||||
private final IWmsCoilQualityChangeLogService iWmsCoilQualityChangeLogService;
|
||||
|
||||
/**
|
||||
* 查询钢卷质量状态变更记录列表
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsCoilQualityChangeLogVo> list(WmsCoilQualityChangeLogBo bo, PageQuery pageQuery) {
|
||||
return iWmsCoilQualityChangeLogService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出钢卷质量状态变更记录列表
|
||||
*/
|
||||
@Log(title = "钢卷质量状态变更记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsCoilQualityChangeLogBo bo, HttpServletResponse response) {
|
||||
List<WmsCoilQualityChangeLogVo> list = iWmsCoilQualityChangeLogService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "钢卷质量状态变更记录", WmsCoilQualityChangeLogVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取钢卷质量状态变更记录详细信息
|
||||
*
|
||||
* @param logId 主键
|
||||
*/
|
||||
@GetMapping("/{logId}")
|
||||
public R<WmsCoilQualityChangeLogVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable Long logId) {
|
||||
return R.ok(iWmsCoilQualityChangeLogService.queryById(logId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增钢卷质量状态变更记录
|
||||
*/
|
||||
@Log(title = "钢卷质量状态变更记录", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCoilQualityChangeLogBo bo) {
|
||||
return toAjax(iWmsCoilQualityChangeLogService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改钢卷质量状态变更记录
|
||||
*/
|
||||
@Log(title = "钢卷质量状态变更记录", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsCoilQualityChangeLogBo bo) {
|
||||
return toAjax(iWmsCoilQualityChangeLogService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除钢卷质量状态变更记录
|
||||
*
|
||||
* @param logIds 主键串
|
||||
*/
|
||||
@Log(title = "钢卷质量状态变更记录", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{logIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable Long[] logIds) {
|
||||
return toAjax(iWmsCoilQualityChangeLogService.deleteWithValidByIds(Arrays.asList(logIds), true));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
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_change_log
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-07-03
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wms_coil_quality_change_log")
|
||||
public class WmsCoilQualityChangeLog extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID=1L;
|
||||
|
||||
/**
|
||||
* 日志主键ID
|
||||
*/
|
||||
@TableId(value = "log_id")
|
||||
private Long logId;
|
||||
/**
|
||||
* 钢卷ID(关联wms_material_coil.coil_id)
|
||||
*/
|
||||
private Long coilId;
|
||||
/**
|
||||
* 变更前质量状态
|
||||
*/
|
||||
private String qualityStatusBefore;
|
||||
/**
|
||||
* 变更后质量状态
|
||||
*/
|
||||
private String qualityStatusAfter;
|
||||
/**
|
||||
* 变更类型(transfer=调拨,inspection=检验,manual=手动修改)
|
||||
*/
|
||||
private String changeType;
|
||||
/**
|
||||
* 关联业务单ID(如调拨单ID等)
|
||||
*/
|
||||
private Long relateId;
|
||||
/**
|
||||
* 变更原因
|
||||
*/
|
||||
private String changeReason;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
/**
|
||||
* 删除标志(0正常 1删除)
|
||||
*/
|
||||
@TableLogic
|
||||
private Long delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
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_change_log
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-07-03
|
||||
*/
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class WmsCoilQualityChangeLogBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 日志主键ID
|
||||
*/
|
||||
private Long logId;
|
||||
|
||||
/**
|
||||
* 钢卷ID(关联wms_material_coil.coil_id)
|
||||
*/
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 变更前质量状态
|
||||
*/
|
||||
private String qualityStatusBefore;
|
||||
|
||||
/**
|
||||
* 变更后质量状态
|
||||
*/
|
||||
private String qualityStatusAfter;
|
||||
|
||||
/**
|
||||
* 变更类型(transfer=调拨,inspection=检验,manual=手动修改)
|
||||
*/
|
||||
private String changeType;
|
||||
|
||||
/**
|
||||
* 关联业务单ID(如调拨单ID等)
|
||||
*/
|
||||
private Long relateId;
|
||||
|
||||
/**
|
||||
* 变更原因
|
||||
*/
|
||||
private String changeReason;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
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_change_log
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-07-03
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class WmsCoilQualityChangeLogVo {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 日志主键ID
|
||||
*/
|
||||
@ExcelProperty(value = "日志主键ID")
|
||||
private Long logId;
|
||||
|
||||
/**
|
||||
* 钢卷ID(关联wms_material_coil.coil_id)
|
||||
*/
|
||||
@ExcelProperty(value = "钢卷ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "关=联wms_material_coil.coil_id")
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 变更前质量状态
|
||||
*/
|
||||
@ExcelProperty(value = "变更前质量状态")
|
||||
private String qualityStatusBefore;
|
||||
|
||||
/**
|
||||
* 变更后质量状态
|
||||
*/
|
||||
@ExcelProperty(value = "变更后质量状态")
|
||||
private String qualityStatusAfter;
|
||||
|
||||
/**
|
||||
* 变更类型(transfer=调拨,inspection=检验,manual=手动修改)
|
||||
*/
|
||||
@ExcelProperty(value = "变更类型", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "t=ransfer=调拨,inspection=检验,manual=手动修改")
|
||||
private String changeType;
|
||||
|
||||
/**
|
||||
* 关联业务单ID(如调拨单ID等)
|
||||
*/
|
||||
@ExcelProperty(value = "关联业务单ID", converter = ExcelDictConvert.class)
|
||||
@ExcelDictFormat(readConverterExp = "如=调拨单ID等")
|
||||
private Long relateId;
|
||||
|
||||
/**
|
||||
* 变更原因
|
||||
*/
|
||||
@ExcelProperty(value = "变更原因")
|
||||
private String changeReason;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.klp.mapper;
|
||||
|
||||
import com.klp.domain.WmsCoilQualityChangeLog;
|
||||
import com.klp.domain.vo.WmsCoilQualityChangeLogVo;
|
||||
import com.klp.common.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 钢卷质量状态变更记录Mapper接口
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-07-03
|
||||
*/
|
||||
public interface WmsCoilQualityChangeLogMapper extends BaseMapperPlus<WmsCoilQualityChangeLogMapper, WmsCoilQualityChangeLog, WmsCoilQualityChangeLogVo> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.klp.service;
|
||||
|
||||
import com.klp.domain.WmsCoilQualityChangeLog;
|
||||
import com.klp.domain.vo.WmsCoilQualityChangeLogVo;
|
||||
import com.klp.domain.bo.WmsCoilQualityChangeLogBo;
|
||||
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-07-03
|
||||
*/
|
||||
public interface IWmsCoilQualityChangeLogService {
|
||||
|
||||
/**
|
||||
* 查询钢卷质量状态变更记录
|
||||
*/
|
||||
WmsCoilQualityChangeLogVo queryById(Long logId);
|
||||
|
||||
/**
|
||||
* 查询钢卷质量状态变更记录列表
|
||||
*/
|
||||
TableDataInfo<WmsCoilQualityChangeLogVo> queryPageList(WmsCoilQualityChangeLogBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询钢卷质量状态变更记录列表
|
||||
*/
|
||||
List<WmsCoilQualityChangeLogVo> queryList(WmsCoilQualityChangeLogBo bo);
|
||||
|
||||
/**
|
||||
* 新增钢卷质量状态变更记录
|
||||
*/
|
||||
Boolean insertByBo(WmsCoilQualityChangeLogBo bo);
|
||||
|
||||
/**
|
||||
* 修改钢卷质量状态变更记录
|
||||
*/
|
||||
Boolean updateByBo(WmsCoilQualityChangeLogBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除钢卷质量状态变更记录信息
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
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.WmsCoilQualityChangeLogBo;
|
||||
import com.klp.domain.vo.WmsCoilQualityChangeLogVo;
|
||||
import com.klp.domain.WmsCoilQualityChangeLog;
|
||||
import com.klp.mapper.WmsCoilQualityChangeLogMapper;
|
||||
import com.klp.service.IWmsCoilQualityChangeLogService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* 钢卷质量状态变更记录Service业务层处理
|
||||
*
|
||||
* @author klp
|
||||
* @date 2026-07-03
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsCoilQualityChangeLogServiceImpl implements IWmsCoilQualityChangeLogService {
|
||||
|
||||
private final WmsCoilQualityChangeLogMapper baseMapper;
|
||||
|
||||
/**
|
||||
* 查询钢卷质量状态变更记录
|
||||
*/
|
||||
@Override
|
||||
public WmsCoilQualityChangeLogVo queryById(Long logId){
|
||||
return baseMapper.selectVoById(logId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询钢卷质量状态变更记录列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsCoilQualityChangeLogVo> queryPageList(WmsCoilQualityChangeLogBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsCoilQualityChangeLog> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsCoilQualityChangeLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询钢卷质量状态变更记录列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsCoilQualityChangeLogVo> queryList(WmsCoilQualityChangeLogBo bo) {
|
||||
LambdaQueryWrapper<WmsCoilQualityChangeLog> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsCoilQualityChangeLog> buildQueryWrapper(WmsCoilQualityChangeLogBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsCoilQualityChangeLog> lqw = Wrappers.lambdaQuery();
|
||||
lqw.eq(bo.getCoilId() != null, WmsCoilQualityChangeLog::getCoilId, bo.getCoilId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getQualityStatusBefore()), WmsCoilQualityChangeLog::getQualityStatusBefore, bo.getQualityStatusBefore());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getQualityStatusAfter()), WmsCoilQualityChangeLog::getQualityStatusAfter, bo.getQualityStatusAfter());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getChangeType()), WmsCoilQualityChangeLog::getChangeType, bo.getChangeType());
|
||||
lqw.eq(bo.getRelateId() != null, WmsCoilQualityChangeLog::getRelateId, bo.getRelateId());
|
||||
lqw.eq(StringUtils.isNotBlank(bo.getChangeReason()), WmsCoilQualityChangeLog::getChangeReason, bo.getChangeReason());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增钢卷质量状态变更记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(WmsCoilQualityChangeLogBo bo) {
|
||||
WmsCoilQualityChangeLog add = BeanUtil.toBean(bo, WmsCoilQualityChangeLog.class);
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setLogId(add.getLogId());
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改钢卷质量状态变更记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsCoilQualityChangeLogBo bo) {
|
||||
WmsCoilQualityChangeLog update = BeanUtil.toBean(bo, WmsCoilQualityChangeLog.class);
|
||||
validEntityBeforeSave(update);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存前的数据校验
|
||||
*/
|
||||
private void validEntityBeforeSave(WmsCoilQualityChangeLog entity){
|
||||
//TODO 做一些数据校验,如唯一约束
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除钢卷质量状态变更记录
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
if(isValid){
|
||||
//TODO 做一些业务上的校验,判断是否需要校验
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?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.WmsCoilQualityChangeLogMapper">
|
||||
|
||||
<resultMap type="com.klp.domain.WmsCoilQualityChangeLog" id="WmsCoilQualityChangeLogResult">
|
||||
<result property="logId" column="log_id"/>
|
||||
<result property="coilId" column="coil_id"/>
|
||||
<result property="qualityStatusBefore" column="quality_status_before"/>
|
||||
<result property="qualityStatusAfter" column="quality_status_after"/>
|
||||
<result property="changeType" column="change_type"/>
|
||||
<result property="relateId" column="relate_id"/>
|
||||
<result property="changeReason" column="change_reason"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<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"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user