diff --git a/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java b/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.java new file mode 100644 index 00000000..d0dd35f0 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsCheckTaskCoilRelationController.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.WmsCheckTaskCoilRelationVo; +import com.klp.domain.bo.WmsCheckTaskCoilRelationBo; +import com.klp.service.IWmsCheckTaskCoilRelationService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 检查任务与钢卷关联 + * + * @author klp + * @date 2026-02-03 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/checkTaskCoilRelation") +public class WmsCheckTaskCoilRelationController extends BaseController { + + private final IWmsCheckTaskCoilRelationService iWmsCheckTaskCoilRelationService; + + /** + * 查询检查任务与钢卷关联列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery) { + return iWmsCheckTaskCoilRelationService.queryPageList(bo, pageQuery); + } + + /** + * 导出检查任务与钢卷关联列表 + */ + @Log(title = "检查任务与钢卷关联", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsCheckTaskCoilRelationBo bo, HttpServletResponse response) { + List list = iWmsCheckTaskCoilRelationService.queryList(bo); + ExcelUtil.exportExcel(list, "检查任务与钢卷关联", WmsCheckTaskCoilRelationVo.class, response); + } + + /** + * 获取检查任务与钢卷关联详细信息 + * + * @param relationId 主键 + */ + @GetMapping("/{relationId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long relationId) { + return R.ok(iWmsCheckTaskCoilRelationService.queryById(relationId)); + } + + /** + * 新增检查任务与钢卷关联 + */ + @Log(title = "检查任务与钢卷关联", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsCheckTaskCoilRelationBo bo) { + return toAjax(iWmsCheckTaskCoilRelationService.insertByBo(bo)); + } + + /** + * 修改检查任务与钢卷关联 + */ + @Log(title = "检查任务与钢卷关联", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsCheckTaskCoilRelationBo bo) { + return toAjax(iWmsCheckTaskCoilRelationService.updateByBo(bo)); + } + + /** + * 删除检查任务与钢卷关联 + * + * @param relationIds 主键串 + */ + @Log(title = "检查任务与钢卷关联", businessType = BusinessType.DELETE) + @DeleteMapping("/{relationIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] relationIds) { + return toAjax(iWmsCheckTaskCoilRelationService.deleteWithValidByIds(Arrays.asList(relationIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java b/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java new file mode 100644 index 00000000..cc93731e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsCheckTaskCoilRelation.java @@ -0,0 +1,41 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 检查任务与钢卷关联对象 wms_check_task_coil_relation + * + * @author klp + * @date 2026-02-03 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_check_task_coil_relation") +public class WmsCheckTaskCoilRelation extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 关联表主键 + */ + @TableId(value = "relation_id") + private Long relationId; + /** + * 检查任务ID，关联wms_check_task.task_id + */ + private Long taskId; + /** + * 钢卷ID + */ + private String coilId; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java new file mode 100644 index 00000000..b3c9cc00 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCheckTaskCoilRelationBo.java @@ -0,0 +1,36 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 检查任务与钢卷关联业务对象 wms_check_task_coil_relation + * + * @author klp + * @date 2026-02-03 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsCheckTaskCoilRelationBo extends BaseEntity { + + /** + * 关联表主键 + */ + private Long relationId; + + /** + * 检查任务ID，关联wms_check_task.task_id + */ + private Long taskId; + + /** + * 钢卷ID + */ + private String coilId; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java new file mode 100644 index 00000000..fb29df8d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsCheckTaskCoilRelationVo.java @@ -0,0 +1,41 @@ +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_check_task_coil_relation + * + * @author klp + * @date 2026-02-03 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsCheckTaskCoilRelationVo { + + private static final long serialVersionUID = 1L; + + /** + * 关联表主键 + */ + @ExcelProperty(value = "关联表主键") + private Long relationId; + + /** + * 检查任务ID，关联wms_check_task.task_id + */ + @ExcelProperty(value = "检查任务ID，关联wms_check_task.task_id") + private Long taskId; + + /** + * 钢卷ID + */ + @ExcelProperty(value = "钢卷ID") + private String coilId; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java new file mode 100644 index 00000000..1af8f5d6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsCheckTaskCoilRelationMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsCheckTaskCoilRelation; +import com.klp.domain.vo.WmsCheckTaskCoilRelationVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 检查任务与钢卷关联Mapper接口 + * + * @author klp + * @date 2026-02-03 + */ +public interface WmsCheckTaskCoilRelationMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java b/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java new file mode 100644 index 00000000..f1c42dae --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsCheckTaskCoilRelationService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsCheckTaskCoilRelation; +import com.klp.domain.vo.WmsCheckTaskCoilRelationVo; +import com.klp.domain.bo.WmsCheckTaskCoilRelationBo; +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-02-03 + */ +public interface IWmsCheckTaskCoilRelationService { + + /** + * 查询检查任务与钢卷关联 + */ + WmsCheckTaskCoilRelationVo queryById(Long relationId); + + /** + * 查询检查任务与钢卷关联列表 + */ + TableDataInfo queryPageList(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery); + + /** + * 查询检查任务与钢卷关联列表 + */ + List queryList(WmsCheckTaskCoilRelationBo bo); + + /** + * 新增检查任务与钢卷关联 + */ + Boolean insertByBo(WmsCheckTaskCoilRelationBo bo); + + /** + * 修改检查任务与钢卷关联 + */ + Boolean updateByBo(WmsCheckTaskCoilRelationBo bo); + + /** + * 校验并批量删除检查任务与钢卷关联信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java new file mode 100644 index 00000000..2ffe8e24 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsCheckTaskCoilRelationServiceImpl.java @@ -0,0 +1,110 @@ +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.WmsCheckTaskCoilRelationBo; +import com.klp.domain.vo.WmsCheckTaskCoilRelationVo; +import com.klp.domain.WmsCheckTaskCoilRelation; +import com.klp.mapper.WmsCheckTaskCoilRelationMapper; +import com.klp.service.IWmsCheckTaskCoilRelationService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 检查任务与钢卷关联Service业务层处理 + * + * @author klp + * @date 2026-02-03 + */ +@RequiredArgsConstructor +@Service +public class WmsCheckTaskCoilRelationServiceImpl implements IWmsCheckTaskCoilRelationService { + + private final WmsCheckTaskCoilRelationMapper baseMapper; + + /** + * 查询检查任务与钢卷关联 + */ + @Override + public WmsCheckTaskCoilRelationVo queryById(Long relationId){ + return baseMapper.selectVoById(relationId); + } + + /** + * 查询检查任务与钢卷关联列表 + */ + @Override + public TableDataInfo queryPageList(WmsCheckTaskCoilRelationBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询检查任务与钢卷关联列表 + */ + @Override + public List queryList(WmsCheckTaskCoilRelationBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsCheckTaskCoilRelationBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getTaskId() != null, WmsCheckTaskCoilRelation::getTaskId, bo.getTaskId()); + lqw.eq(StringUtils.isNotBlank(bo.getCoilId()), WmsCheckTaskCoilRelation::getCoilId, bo.getCoilId()); + return lqw; + } + + /** + * 新增检查任务与钢卷关联 + */ + @Override + public Boolean insertByBo(WmsCheckTaskCoilRelationBo bo) { + WmsCheckTaskCoilRelation add = BeanUtil.toBean(bo, WmsCheckTaskCoilRelation.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRelationId(add.getRelationId()); + } + return flag; + } + + /** + * 修改检查任务与钢卷关联 + */ + @Override + public Boolean updateByBo(WmsCheckTaskCoilRelationBo bo) { + WmsCheckTaskCoilRelation update = BeanUtil.toBean(bo, WmsCheckTaskCoilRelation.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsCheckTaskCoilRelation 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/WmsCheckTaskCoilRelationMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml new file mode 100644 index 00000000..64d62db3 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsCheckTaskCoilRelationMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + +