From 3d7fd09c600ec4ab308fcf11097b5b4797e36908 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 20 Apr 2026 15:23:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E8=B4=A8=E9=87=8F=E6=94=B9=E5=88=A4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建 WmsCoilQualityRejudge 实体类定义数据库表结构 - 实现 IWmsCoilQualityRejudgeService 接口及其实现类 - 开发 WmsCoilQualityRejudgeController 控制器提供 REST API - 添加 WmsCoilQualityRejudgeMapper 数据访问层接口 - 配置 MyBatis XML 映射文件实现数据库操作 - 定义 WmsCoilQualityRejudgeBo 业务对象和 Vo 视图对象 - 实现分页查询、新增、修改、删除等基础 CRUD 功能 - 集成 Excel 导出功能支持数据批量导出 - 添加数据验证和业务逻辑处理机制 --- .../WmsCoilQualityRejudgeController.java | 99 ++++++++++++++++ .../com/klp/domain/WmsCoilQualityRejudge.java | 53 +++++++++ .../domain/bo/WmsCoilQualityRejudgeBo.java | 51 ++++++++ .../domain/vo/WmsCoilQualityRejudgeVo.java | 59 +++++++++ .../mapper/WmsCoilQualityRejudgeMapper.java | 15 +++ .../IWmsCoilQualityRejudgeService.java | 49 ++++++++ .../WmsCoilQualityRejudgeServiceImpl.java | 112 ++++++++++++++++++ .../klp/WmsCoilQualityRejudgeMapper.xml | 22 ++++ 8 files changed, 460 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsCoilQualityRejudgeController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsCoilQualityRejudge.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsCoilQualityRejudgeBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsCoilQualityRejudgeVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsCoilQualityRejudgeMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsCoilQualityRejudgeService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsCoilQualityRejudgeServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsCoilQualityRejudgeMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilQualityRejudgeController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilQualityRejudgeController.java new file mode 100644 index 00000000..f38ab986 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilQualityRejudgeController.java @@ -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 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 list = iWmsCoilQualityRejudgeService.queryList(bo); + ExcelUtil.exportExcel(list, "钢卷质量改判记录", WmsCoilQualityRejudgeVo.class, response); + } + + /** + * 获取钢卷质量改判记录详细信息 + * + * @param rejudgeId 主键 + */ + @GetMapping("/{rejudgeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long rejudgeId) { + return R.ok(iWmsCoilQualityRejudgeService.queryById(rejudgeId)); + } + + /** + * 新增钢卷质量改判记录 + */ + @Log(title = "钢卷质量改判记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCoilQualityRejudgeBo bo) { + return toAjax(iWmsCoilQualityRejudgeService.insertByBo(bo)); + } + + /** + * 修改钢卷质量改判记录 + */ + @Log(title = "钢卷质量改判记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCoilQualityRejudgeBo bo) { + return toAjax(iWmsCoilQualityRejudgeService.updateByBo(bo)); + } + + /** + * 删除钢卷质量改判记录 + * + * @param rejudgeIds 主键串 + */ + @Log(title = "钢卷质量改判记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{rejudgeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] rejudgeIds) { + return toAjax(iWmsCoilQualityRejudgeService.deleteWithValidByIds(Arrays.asList(rejudgeIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilQualityRejudge.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilQualityRejudge.java new file mode 100644 index 00000000..22c74640 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilQualityRejudge.java @@ -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; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilQualityRejudgeBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilQualityRejudgeBo.java new file mode 100644 index 00000000..7955a5f9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilQualityRejudgeBo.java @@ -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; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilQualityRejudgeVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilQualityRejudgeVo.java new file mode 100644 index 00000000..f857f60e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilQualityRejudgeVo.java @@ -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; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilQualityRejudgeMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilQualityRejudgeMapper.java new file mode 100644 index 00000000..38cb425e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilQualityRejudgeMapper.java @@ -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 { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCoilQualityRejudgeService.java b/klp-wms/src/main/java/com/klp/service/IWmsCoilQualityRejudgeService.java new file mode 100644 index 00000000..61462f95 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsCoilQualityRejudgeService.java @@ -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 queryPageList(WmsCoilQualityRejudgeBo bo, PageQuery pageQuery); + + /** + * 查询钢卷质量改判记录列表 + */ + List queryList(WmsCoilQualityRejudgeBo bo); + + /** + * 新增钢卷质量改判记录 + */ + Boolean insertByBo(WmsCoilQualityRejudgeBo bo); + + /** + * 修改钢卷质量改判记录 + */ + Boolean updateByBo(WmsCoilQualityRejudgeBo bo); + + /** + * 校验并批量删除钢卷质量改判记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilQualityRejudgeServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilQualityRejudgeServiceImpl.java new file mode 100644 index 00000000..05bfc714 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilQualityRejudgeServiceImpl.java @@ -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 queryPageList(WmsCoilQualityRejudgeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询钢卷质量改判记录列表 + */ + @Override + public List queryList(WmsCoilQualityRejudgeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCoilQualityRejudgeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilQualityRejudgeMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilQualityRejudgeMapper.xml new file mode 100644 index 00000000..93cdf0b3 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilQualityRejudgeMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + +