From 143853a87d08a3019ff12f47232dd27b3c50f7e1 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 25 Jun 2026 11:34:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(flow):=20=E6=B7=BB=E5=8A=A0=E6=8E=92?= =?UTF-8?q?=E4=BA=A7=E6=98=8E=E7=BB=86=E9=92=A2=E5=8D=B7=E5=85=B3=E7=B3=BB?= =?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 - 创建排产明细钢卷关系实体类 SchDetailCoilRel - 定义业务对象 SchDetailCoilRelBo 和视图对象 SchDetailCoilRelVo - 实现排产明细钢卷关系服务接口 ISchDetailCoilRelService - 开发控制器 SchDetailCoilRelController 提供 REST API - 创建数据访问层 SchDetailCoilRelMapper 和 XML 映射文件 - 实现服务层业务逻辑 SchDetailCoilRelServiceImpl - 集成分页查询、新增、修改、删除等基础操作 - 添加 Excel 导出功能和数据验证机制 --- .../SchDetailCoilRelController.java | 99 ++++++++++++++++ .../com/klp/flow/domain/SchDetailCoilRel.java | 45 ++++++++ .../flow/domain/bo/SchDetailCoilRelBo.java | 41 +++++++ .../flow/domain/vo/SchDetailCoilRelVo.java | 49 ++++++++ .../flow/mapper/SchDetailCoilRelMapper.java | 15 +++ .../service/ISchDetailCoilRelService.java | 49 ++++++++ .../impl/SchDetailCoilRelServiceImpl.java | 109 ++++++++++++++++++ .../mapper/flow/SchDetailCoilRelMapper.xml | 20 ++++ 8 files changed, 427 insertions(+) create mode 100644 klp-flow/src/main/java/com/klp/flow/controller/SchDetailCoilRelController.java create mode 100644 klp-flow/src/main/java/com/klp/flow/domain/SchDetailCoilRel.java create mode 100644 klp-flow/src/main/java/com/klp/flow/domain/bo/SchDetailCoilRelBo.java create mode 100644 klp-flow/src/main/java/com/klp/flow/domain/vo/SchDetailCoilRelVo.java create mode 100644 klp-flow/src/main/java/com/klp/flow/mapper/SchDetailCoilRelMapper.java create mode 100644 klp-flow/src/main/java/com/klp/flow/service/ISchDetailCoilRelService.java create mode 100644 klp-flow/src/main/java/com/klp/flow/service/impl/SchDetailCoilRelServiceImpl.java create mode 100644 klp-flow/src/main/resources/mapper/flow/SchDetailCoilRelMapper.xml diff --git a/klp-flow/src/main/java/com/klp/flow/controller/SchDetailCoilRelController.java b/klp-flow/src/main/java/com/klp/flow/controller/SchDetailCoilRelController.java new file mode 100644 index 000000000..8256c50ab --- /dev/null +++ b/klp-flow/src/main/java/com/klp/flow/controller/SchDetailCoilRelController.java @@ -0,0 +1,99 @@ +package com.klp.flow.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.flow.domain.vo.SchDetailCoilRelVo; +import com.klp.flow.domain.bo.SchDetailCoilRelBo; +import com.klp.flow.service.ISchDetailCoilRelService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 排产明细钢卷关系 + * + * @author klp + * @date 2026-06-25 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/flow/detailCoilRel") +public class SchDetailCoilRelController extends BaseController { + + private final ISchDetailCoilRelService iSchDetailCoilRelService; + + /** + * 查询排产明细钢卷关系列表 + */ + @GetMapping("/list") + public TableDataInfo list(SchDetailCoilRelBo bo, PageQuery pageQuery) { + return iSchDetailCoilRelService.queryPageList(bo, pageQuery); + } + + /** + * 导出排产明细钢卷关系列表 + */ + @Log(title = "排产明细钢卷关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(SchDetailCoilRelBo bo, HttpServletResponse response) { + List list = iSchDetailCoilRelService.queryList(bo); + ExcelUtil.exportExcel(list, "排产明细钢卷关系", SchDetailCoilRelVo.class, response); + } + + /** + * 获取排产明细钢卷关系详细信息 + * + * @param relId 主键 + */ + @GetMapping("/{relId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long relId) { + return R.ok(iSchDetailCoilRelService.queryById(relId)); + } + + /** + * 新增排产明细钢卷关系 + */ + @Log(title = "排产明细钢卷关系", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody SchDetailCoilRelBo bo) { + return toAjax(iSchDetailCoilRelService.insertByBo(bo)); + } + + /** + * 修改排产明细钢卷关系 + */ + @Log(title = "排产明细钢卷关系", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody SchDetailCoilRelBo bo) { + return toAjax(iSchDetailCoilRelService.updateByBo(bo)); + } + + /** + * 删除排产明细钢卷关系 + * + * @param relIds 主键串 + */ + @Log(title = "排产明细钢卷关系", businessType = BusinessType.DELETE) + @DeleteMapping("/{relIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] relIds) { + return toAjax(iSchDetailCoilRelService.deleteWithValidByIds(Arrays.asList(relIds), true)); + } +} diff --git a/klp-flow/src/main/java/com/klp/flow/domain/SchDetailCoilRel.java b/klp-flow/src/main/java/com/klp/flow/domain/SchDetailCoilRel.java new file mode 100644 index 000000000..34f40e079 --- /dev/null +++ b/klp-flow/src/main/java/com/klp/flow/domain/SchDetailCoilRel.java @@ -0,0 +1,45 @@ +package com.klp.flow.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + + +/** + * 排产明细钢卷关系对象 sch_detail_coil_rel + * + * @author klp + * @date 2026-06-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sch_detail_coil_rel") +public class SchDetailCoilRel extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键 + */ + @TableId(value = "rel_id") + private Long relId; + /** + * 排产明细ID（关联 sch_prod_schedule_detail.schedule_detail_id） + */ + private Long scheduleDetailId; + /** + * 钢卷ID（关联 wms_material_coil.coil_id） + */ + private Long coilId; + /** + * 备注 + */ + private String remark; + /** + * 删除标志（0=正常，1=已删除） + */ + @TableLogic + private Integer delFlag; + +} diff --git a/klp-flow/src/main/java/com/klp/flow/domain/bo/SchDetailCoilRelBo.java b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchDetailCoilRelBo.java new file mode 100644 index 000000000..204d334eb --- /dev/null +++ b/klp-flow/src/main/java/com/klp/flow/domain/bo/SchDetailCoilRelBo.java @@ -0,0 +1,41 @@ +package com.klp.flow.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + + +/** + * 排产明细钢卷关系业务对象 sch_detail_coil_rel + * + * @author klp + * @date 2026-06-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class SchDetailCoilRelBo extends BaseEntity { + + /** + * 主键 + */ + private Long relId; + + /** + * 排产明细ID（关联 sch_prod_schedule_detail.schedule_detail_id） + */ + private Long scheduleDetailId; + + /** + * 钢卷ID（关联 wms_material_coil.coil_id） + */ + private Long coilId; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-flow/src/main/java/com/klp/flow/domain/vo/SchDetailCoilRelVo.java b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchDetailCoilRelVo.java new file mode 100644 index 000000000..b92836493 --- /dev/null +++ b/klp-flow/src/main/java/com/klp/flow/domain/vo/SchDetailCoilRelVo.java @@ -0,0 +1,49 @@ +package com.klp.flow.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; + + +/** + * 排产明细钢卷关系视图对象 sch_detail_coil_rel + * + * @author klp + * @date 2026-06-25 + */ +@Data +@ExcelIgnoreUnannotated +public class SchDetailCoilRelVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long relId; + + /** + * 排产明细ID（关联 sch_prod_schedule_detail.schedule_detail_id） + */ + @ExcelProperty(value = "排产明细ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联,s=ch_prod_schedule_detail.schedule_detail_id") + private Long scheduleDetailId; + + /** + * 钢卷ID（关联 wms_material_coil.coil_id） + */ + @ExcelProperty(value = "钢卷ID", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "关=联,w=ms_material_coil.coil_id") + private Long coilId; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-flow/src/main/java/com/klp/flow/mapper/SchDetailCoilRelMapper.java b/klp-flow/src/main/java/com/klp/flow/mapper/SchDetailCoilRelMapper.java new file mode 100644 index 000000000..371f30b2c --- /dev/null +++ b/klp-flow/src/main/java/com/klp/flow/mapper/SchDetailCoilRelMapper.java @@ -0,0 +1,15 @@ +package com.klp.flow.mapper; + +import com.klp.flow.domain.SchDetailCoilRel; +import com.klp.flow.domain.vo.SchDetailCoilRelVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 排产明细钢卷关系Mapper接口 + * + * @author klp + * @date 2026-06-25 + */ +public interface SchDetailCoilRelMapper extends BaseMapperPlus { + +} diff --git a/klp-flow/src/main/java/com/klp/flow/service/ISchDetailCoilRelService.java b/klp-flow/src/main/java/com/klp/flow/service/ISchDetailCoilRelService.java new file mode 100644 index 000000000..d5749f55f --- /dev/null +++ b/klp-flow/src/main/java/com/klp/flow/service/ISchDetailCoilRelService.java @@ -0,0 +1,49 @@ +package com.klp.flow.service; + +import com.klp.flow.domain.SchDetailCoilRel; +import com.klp.flow.domain.vo.SchDetailCoilRelVo; +import com.klp.flow.domain.bo.SchDetailCoilRelBo; +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-06-25 + */ +public interface ISchDetailCoilRelService { + + /** + * 查询排产明细钢卷关系 + */ + SchDetailCoilRelVo queryById(Long relId); + + /** + * 查询排产明细钢卷关系列表 + */ + TableDataInfo queryPageList(SchDetailCoilRelBo bo, PageQuery pageQuery); + + /** + * 查询排产明细钢卷关系列表 + */ + List queryList(SchDetailCoilRelBo bo); + + /** + * 新增排产明细钢卷关系 + */ + Boolean insertByBo(SchDetailCoilRelBo bo); + + /** + * 修改排产明细钢卷关系 + */ + Boolean updateByBo(SchDetailCoilRelBo bo); + + /** + * 校验并批量删除排产明细钢卷关系信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-flow/src/main/java/com/klp/flow/service/impl/SchDetailCoilRelServiceImpl.java b/klp-flow/src/main/java/com/klp/flow/service/impl/SchDetailCoilRelServiceImpl.java new file mode 100644 index 000000000..87b0b9a2c --- /dev/null +++ b/klp-flow/src/main/java/com/klp/flow/service/impl/SchDetailCoilRelServiceImpl.java @@ -0,0 +1,109 @@ +package com.klp.flow.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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.flow.domain.bo.SchDetailCoilRelBo; +import com.klp.flow.domain.vo.SchDetailCoilRelVo; +import com.klp.flow.domain.SchDetailCoilRel; +import com.klp.flow.mapper.SchDetailCoilRelMapper; +import com.klp.flow.service.ISchDetailCoilRelService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 排产明细钢卷关系Service业务层处理 + * + * @author klp + * @date 2026-06-25 + */ +@RequiredArgsConstructor +@Service +public class SchDetailCoilRelServiceImpl implements ISchDetailCoilRelService { + + private final SchDetailCoilRelMapper baseMapper; + + /** + * 查询排产明细钢卷关系 + */ + @Override + public SchDetailCoilRelVo queryById(Long relId){ + return baseMapper.selectVoById(relId); + } + + /** + * 查询排产明细钢卷关系列表 + */ + @Override + public TableDataInfo queryPageList(SchDetailCoilRelBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询排产明细钢卷关系列表 + */ + @Override + public List queryList(SchDetailCoilRelBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SchDetailCoilRelBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getScheduleDetailId() != null, SchDetailCoilRel::getScheduleDetailId, bo.getScheduleDetailId()); + lqw.eq(bo.getCoilId() != null, SchDetailCoilRel::getCoilId, bo.getCoilId()); + return lqw; + } + + /** + * 新增排产明细钢卷关系 + */ + @Override + public Boolean insertByBo(SchDetailCoilRelBo bo) { + SchDetailCoilRel add = BeanUtil.toBean(bo, SchDetailCoilRel.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setRelId(add.getRelId()); + } + return flag; + } + + /** + * 修改排产明细钢卷关系 + */ + @Override + public Boolean updateByBo(SchDetailCoilRelBo bo) { + SchDetailCoilRel update = BeanUtil.toBean(bo, SchDetailCoilRel.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SchDetailCoilRel entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除排产明细钢卷关系 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-flow/src/main/resources/mapper/flow/SchDetailCoilRelMapper.xml b/klp-flow/src/main/resources/mapper/flow/SchDetailCoilRelMapper.xml new file mode 100644 index 000000000..4d23596d6 --- /dev/null +++ b/klp-flow/src/main/resources/mapper/flow/SchDetailCoilRelMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + +