diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCoilQualityChangeLogController.java b/klp-wms/src/main/java/com/klp/controller/WmsCoilQualityChangeLogController.java new file mode 100644 index 000000000..2cbb4556f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsCoilQualityChangeLogController.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.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 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 list = iWmsCoilQualityChangeLogService.queryList(bo); + ExcelUtil.exportExcel(list, "钢卷质量状态变更记录", WmsCoilQualityChangeLogVo.class, response); + } + + /** + * 获取钢卷质量状态变更记录详细信息 + * + * @param logId 主键 + */ + @GetMapping("/{logId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long logId) { + return R.ok(iWmsCoilQualityChangeLogService.queryById(logId)); + } + + /** + * 新增钢卷质量状态变更记录 + */ + @Log(title = "钢卷质量状态变更记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCoilQualityChangeLogBo bo) { + return toAjax(iWmsCoilQualityChangeLogService.insertByBo(bo)); + } + + /** + * 修改钢卷质量状态变更记录 + */ + @Log(title = "钢卷质量状态变更记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCoilQualityChangeLogBo bo) { + return toAjax(iWmsCoilQualityChangeLogService.updateByBo(bo)); + } + + /** + * 删除钢卷质量状态变更记录 + * + * @param logIds 主键串 + */ + @Log(title = "钢卷质量状态变更记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{logIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] logIds) { + return toAjax(iWmsCoilQualityChangeLogService.deleteWithValidByIds(Arrays.asList(logIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCoilQualityChangeLog.java b/klp-wms/src/main/java/com/klp/domain/WmsCoilQualityChangeLog.java new file mode 100644 index 000000000..34aacc8eb --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsCoilQualityChangeLog.java @@ -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; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilQualityChangeLogBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilQualityChangeLogBo.java new file mode 100644 index 000000000..5327930a9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilQualityChangeLogBo.java @@ -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; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilQualityChangeLogVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilQualityChangeLogVo.java new file mode 100644 index 000000000..c487ebe4c --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCoilQualityChangeLogVo.java @@ -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; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCoilQualityChangeLogMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCoilQualityChangeLogMapper.java new file mode 100644 index 000000000..4ffa229c3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCoilQualityChangeLogMapper.java @@ -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 { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCoilQualityChangeLogService.java b/klp-wms/src/main/java/com/klp/service/IWmsCoilQualityChangeLogService.java new file mode 100644 index 000000000..c07203150 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsCoilQualityChangeLogService.java @@ -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 queryPageList(WmsCoilQualityChangeLogBo bo, PageQuery pageQuery); + + /** + * 查询钢卷质量状态变更记录列表 + */ + List queryList(WmsCoilQualityChangeLogBo bo); + + /** + * 新增钢卷质量状态变更记录 + */ + Boolean insertByBo(WmsCoilQualityChangeLogBo bo); + + /** + * 修改钢卷质量状态变更记录 + */ + Boolean updateByBo(WmsCoilQualityChangeLogBo bo); + + /** + * 校验并批量删除钢卷质量状态变更记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCoilQualityChangeLogServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilQualityChangeLogServiceImpl.java new file mode 100644 index 000000000..bc1f229f9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCoilQualityChangeLogServiceImpl.java @@ -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 queryPageList(WmsCoilQualityChangeLogBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询钢卷质量状态变更记录列表 + */ + @Override + public List queryList(WmsCoilQualityChangeLogBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCoilQualityChangeLogBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper 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 ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsCoilQualityChangeLogMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCoilQualityChangeLogMapper.xml new file mode 100644 index 000000000..8f3c196ff --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsCoilQualityChangeLogMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + +