From 62b594026bfa1c5cd30c223518cc1969de384231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= <15984991+wwh2328692301@user.noreply.gitee.com> Date: Mon, 20 Apr 2026 18:20:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(wms):=20=E8=A7=84=E7=A8=8B=E4=B8=BB?= =?UTF-8?q?=E8=A1=A8=20wms=5Fprocess=5Fspec=20=E5=85=A8=E6=A0=88=20CRUD?= =?UTF-8?q?=EF=BC=88=E4=BB=BB=E5=8A=A12=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增规程档案后端（Entity/BO/VO/Mapper/Service/Controller），接口前缀 /wms/processSpec， 含分页查询、导出、详情、增删改；保存时校验规程编号唯一；逻辑删除与全局配置一致（0 未删 / 2 已删）。 新增 Flyway 脚本 V10 建表及唯一索引；前端增加 api/wms/processSpec.js 与 views/wms/processSpec/index.vue， 支持按编号/名称/类型/产线/产品类型/启用状态筛选，产线下拉关联现有产线接口。 说明：需在目标库执行迁移并在菜单中配置组件路径 wms/processSpec/index。 --- .../db/migration/V10__wms_process_spec.sql | 20 ++ klp-ui/src/api/wms/processSpec.js | 44 +++ klp-ui/src/views/wms/processSpec/index.vue | 306 ++++++++++++++++++ .../controller/WmsProcessSpecController.java | 99 ++++++ .../java/com/klp/domain/WmsProcessSpec.java | 68 ++++ .../com/klp/domain/bo/WmsProcessSpecBo.java | 65 ++++ .../com/klp/domain/vo/WmsProcessSpecVo.java | 82 +++++ .../com/klp/mapper/WmsProcessSpecMapper.java | 14 + .../klp/service/IWmsProcessSpecService.java | 47 +++ .../impl/WmsProcessSpecServiceImpl.java | 101 ++++++ .../mapper/klp/WmsProcessSpecMapper.xml | 23 ++ 11 files changed, 869 insertions(+) create mode 100644 klp-admin/src/main/resources/db/migration/V10__wms_process_spec.sql create mode 100644 klp-ui/src/api/wms/processSpec.js create mode 100644 klp-ui/src/views/wms/processSpec/index.vue create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsProcessSpecController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsProcessSpec.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsProcessSpecService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsProcessSpecMapper.xml diff --git a/klp-admin/src/main/resources/db/migration/V10__wms_process_spec.sql b/klp-admin/src/main/resources/db/migration/V10__wms_process_spec.sql new file mode 100644 index 00000000..211b8545 --- /dev/null +++ b/klp-admin/src/main/resources/db/migration/V10__wms_process_spec.sql @@ -0,0 +1,20 @@ +-- 冷轧涂镀数智运营 - 规程主表 +CREATE TABLE wms_process_spec ( + spec_id BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键', + spec_code VARCHAR(64) NOT NULL COMMENT '规程编号', + spec_name VARCHAR(200) NOT NULL COMMENT '规程名称', + spec_type VARCHAR(32) NOT NULL DEFAULT 'PROCESS' COMMENT '类型(PROCESS=工艺规程,STANDARD=标准)', + line_id BIGINT NOT NULL COMMENT '产线ID', + product_type VARCHAR(100) NULL COMMENT '产品类型', + is_enabled TINYINT NOT NULL DEFAULT 1 COMMENT '是否启用(0否1是)', + create_by VARCHAR(64) NULL COMMENT '创建人', + create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) NULL COMMENT '更新人', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标志(0正常2删除，与全局逻辑删除配置一致)', + remark VARCHAR(500) NULL COMMENT '备注', + PRIMARY KEY (spec_id), + UNIQUE KEY uk_wms_process_spec_code (spec_code), + KEY idx_wms_process_spec_line (line_id), + KEY idx_wms_process_spec_type (spec_type) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规程主表'; diff --git a/klp-ui/src/api/wms/processSpec.js b/klp-ui/src/api/wms/processSpec.js new file mode 100644 index 00000000..5fc0a17a --- /dev/null +++ b/klp-ui/src/api/wms/processSpec.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询规程主表列表 +export function listProcessSpec(query) { + return request({ + url: '/wms/processSpec/list', + method: 'get', + params: query + }) +} + +// 查询规程主表详细 +export function getProcessSpec(specId) { + return request({ + url: '/wms/processSpec/' + specId, + method: 'get' + }) +} + +// 新增规程主表 +export function addProcessSpec(data) { + return request({ + url: '/wms/processSpec', + method: 'post', + data: data + }) +} + +// 修改规程主表 +export function updateProcessSpec(data) { + return request({ + url: '/wms/processSpec', + method: 'put', + data: data + }) +} + +// 删除规程主表 +export function delProcessSpec(specId) { + return request({ + url: '/wms/processSpec/' + specId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/processSpec/index.vue b/klp-ui/src/views/wms/processSpec/index.vue new file mode 100644 index 00000000..68128c8e --- /dev/null +++ b/klp-ui/src/views/wms/processSpec/index.vue @@ -0,0 +1,306 @@ + + + diff --git a/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecController.java b/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecController.java new file mode 100644 index 00000000..54ea98a9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +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.page.TableDataInfo; +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.bo.WmsProcessSpecBo; +import com.klp.domain.vo.WmsProcessSpecVo; +import com.klp.service.IWmsProcessSpecService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 规程主表 + * + * @author klp + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/processSpec") +public class WmsProcessSpecController extends BaseController { + + private final IWmsProcessSpecService wmsProcessSpecService; + + /** + * 查询规程主表列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsProcessSpecBo bo, PageQuery pageQuery) { + return wmsProcessSpecService.queryPageList(bo, pageQuery); + } + + /** + * 导出规程主表列表 + */ + @Log(title = "规程主表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsProcessSpecBo bo, HttpServletResponse response) { + List list = wmsProcessSpecService.queryList(bo); + ExcelUtil.exportExcel(list, "规程主表", WmsProcessSpecVo.class, response); + } + + /** + * 获取规程主表详细信息 + * + * @param specId 主键 + */ + @GetMapping("/{specId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long specId) { + return R.ok(wmsProcessSpecService.queryById(specId)); + } + + /** + * 新增规程主表 + */ + @Log(title = "规程主表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsProcessSpecBo bo) { + return toAjax(wmsProcessSpecService.insertByBo(bo)); + } + + /** + * 修改规程主表 + */ + @Log(title = "规程主表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsProcessSpecBo bo) { + return toAjax(wmsProcessSpecService.updateByBo(bo)); + } + + /** + * 删除规程主表 + * + * @param specIds 主键串 + */ + @Log(title = "规程主表", businessType = BusinessType.DELETE) + @DeleteMapping("/{specIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] specIds) { + return toAjax(wmsProcessSpecService.deleteWithValidByIds(Arrays.asList(specIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProcessSpec.java b/klp-wms/src/main/java/com/klp/domain/WmsProcessSpec.java new file mode 100644 index 00000000..98835514 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsProcessSpec.java @@ -0,0 +1,68 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 规程主表对象 wms_process_spec + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_process_spec") +public class WmsProcessSpec extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "spec_id") + private Long specId; + + /** + * 规程编号 + */ + private String specCode; + + /** + * 规程名称 + */ + private String specName; + + /** + * 类型(PROCESS/STANDARD) + */ + private String specType; + + /** + * 产线ID + */ + private Long lineId; + + /** + * 产品类型 + */ + private String productType; + + /** + * 是否启用（0=否，1=是） + */ + private Integer isEnabled; + + /** + * 删除标志（0=正常，2=删除，与全局 logicDeleteValue 一致） + */ + @TableLogic + private Integer delFlag; + + /** + * 备注 + */ + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecBo.java new file mode 100644 index 00000000..227cb06a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecBo.java @@ -0,0 +1,65 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 规程主表业务对象 wms_process_spec + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsProcessSpecBo extends BaseEntity { + + /** + * 主键 + */ + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long specId; + + /** + * 规程编号 + */ + @NotBlank(message = "规程编号不能为空", groups = {AddGroup.class, EditGroup.class}) + private String specCode; + + /** + * 规程名称 + */ + @NotBlank(message = "规程名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String specName; + + /** + * 类型(PROCESS/STANDARD) + */ + @NotBlank(message = "规程类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private String specType; + + /** + * 产线ID + */ + @NotNull(message = "产线不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long lineId; + + /** + * 产品类型 + */ + private String productType; + + /** + * 是否启用（0=否，1=是） + */ + private Integer isEnabled; + + /** + * 备注 + */ + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVo.java new file mode 100644 index 00000000..3dcaf894 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVo.java @@ -0,0 +1,82 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 规程主表视图对象 wms_process_spec + * + * @author klp + */ +@Data +@ExcelIgnoreUnannotated +public class WmsProcessSpecVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ExcelProperty(value = "主键") + private Long specId; + + /** + * 规程编号 + */ + @ExcelProperty(value = "规程编号") + private String specCode; + + /** + * 规程名称 + */ + @ExcelProperty(value = "规程名称") + private String specName; + + /** + * 类型(PROCESS/STANDARD) + */ + @ExcelProperty(value = "规程类型") + private String specType; + + /** + * 产线ID + */ + @ExcelProperty(value = "产线ID") + private Long lineId; + + /** + * 产品类型 + */ + @ExcelProperty(value = "产品类型") + private String productType; + + /** + * 是否启用（0=否，1=是） + */ + @ExcelProperty(value = "是否启用") + private Integer isEnabled; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新时间 + */ + @ExcelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecMapper.java new file mode 100644 index 00000000..69c1ad41 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecMapper.java @@ -0,0 +1,14 @@ +package com.klp.mapper; + +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.domain.WmsProcessSpec; +import com.klp.domain.vo.WmsProcessSpecVo; + +/** + * 规程主表Mapper接口 + * + * @author klp + */ +public interface WmsProcessSpecMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecService.java b/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecService.java new file mode 100644 index 00000000..22c0ead6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecService.java @@ -0,0 +1,47 @@ +package com.klp.service; + +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.domain.bo.WmsProcessSpecBo; +import com.klp.domain.vo.WmsProcessSpecVo; + +import java.util.Collection; +import java.util.List; + +/** + * 规程主表Service接口 + * + * @author klp + */ +public interface IWmsProcessSpecService { + + /** + * 查询规程主表 + */ + WmsProcessSpecVo queryById(Long specId); + + /** + * 查询规程主表分页列表 + */ + TableDataInfo queryPageList(WmsProcessSpecBo bo, PageQuery pageQuery); + + /** + * 查询规程主表列表 + */ + List queryList(WmsProcessSpecBo bo); + + /** + * 新增规程主表 + */ + Boolean insertByBo(WmsProcessSpecBo bo); + + /** + * 修改规程主表 + */ + Boolean updateByBo(WmsProcessSpecBo bo); + + /** + * 校验并批量删除规程主表 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java new file mode 100644 index 00000000..6c5b080a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java @@ -0,0 +1,101 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsProcessSpec; +import com.klp.domain.bo.WmsProcessSpecBo; +import com.klp.domain.vo.WmsProcessSpecVo; +import com.klp.mapper.WmsProcessSpecMapper; +import com.klp.service.IWmsProcessSpecService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 规程主表Service业务层处理 + * + * @author klp + */ +@RequiredArgsConstructor +@Service +public class WmsProcessSpecServiceImpl implements IWmsProcessSpecService { + + private final WmsProcessSpecMapper baseMapper; + + @Override + public WmsProcessSpecVo queryById(Long specId) { + return baseMapper.selectVoById(specId); + } + + @Override + public TableDataInfo queryPageList(WmsProcessSpecBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(WmsProcessSpecBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsProcessSpecBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getSpecCode()), WmsProcessSpec::getSpecCode, bo.getSpecCode()); + lqw.like(StringUtils.isNotBlank(bo.getSpecName()), WmsProcessSpec::getSpecName, bo.getSpecName()); + lqw.eq(StringUtils.isNotBlank(bo.getSpecType()), WmsProcessSpec::getSpecType, bo.getSpecType()); + lqw.eq(bo.getLineId() != null, WmsProcessSpec::getLineId, bo.getLineId()); + lqw.like(StringUtils.isNotBlank(bo.getProductType()), WmsProcessSpec::getProductType, bo.getProductType()); + lqw.eq(bo.getIsEnabled() != null, WmsProcessSpec::getIsEnabled, bo.getIsEnabled()); + return lqw; + } + + @Override + public Boolean insertByBo(WmsProcessSpecBo bo) { + WmsProcessSpec add = BeanUtil.toBean(bo, WmsProcessSpec.class); + if (add.getIsEnabled() == null) { + add.setIsEnabled(1); + } + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setSpecId(add.getSpecId()); + } + return flag; + } + + @Override + public Boolean updateByBo(WmsProcessSpecBo bo) { + WmsProcessSpec update = BeanUtil.toBean(bo, WmsProcessSpec.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + private void validEntityBeforeSave(WmsProcessSpec entity) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsProcessSpec::getSpecCode, entity.getSpecCode()); + if (entity.getSpecId() != null) { + lqw.ne(WmsProcessSpec::getSpecId, entity.getSpecId()); + } + if (baseMapper.selectCount(lqw) > 0) { + throw new ServiceException("规程编号已存在"); + } + } + + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (Boolean.TRUE.equals(isValid)) { + // 任务3 可在此校验版本等从表数据 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecMapper.xml new file mode 100644 index 00000000..51df1fb3 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + From f501994da6a75b3a4ad7cc0b4b3da7626ef87699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= <15984991+wwh2328692301@user.noreply.gitee.com> Date: Mon, 20 Apr 2026 19:14:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(wms):=20=E5=A2=9E=E5=8A=A0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=92=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在规程主表的操作列中新增“版本与方案”按钮，点击后可跳转至版本管理页面。更新了操作列的宽度以适应新按钮。同时，在后端服务中添加了对规程版本存在性的校验，确保在删除规程时不会影响相关版本数据。 --- .../V11__wms_process_spec_version_plan.sql | 39 ++ klp-ui/src/api/wms/processPlan.js | 39 ++ klp-ui/src/api/wms/processSpecVersion.js | 46 +++ klp-ui/src/views/wms/processSpec/index.vue | 18 +- .../views/wms/processSpec/versionManage.vue | 374 ++++++++++++++++++ .../controller/WmsProcessPlanController.java | 75 ++++ .../WmsProcessSpecVersionController.java | 85 ++++ .../java/com/klp/domain/WmsProcessPlan.java | 59 +++ .../com/klp/domain/WmsProcessSpecVersion.java | 49 +++ .../com/klp/domain/bo/WmsProcessPlanBo.java | 42 ++ .../domain/bo/WmsProcessSpecVersionBo.java | 41 ++ .../com/klp/domain/vo/WmsProcessPlanVo.java | 50 +++ .../domain/vo/WmsProcessSpecVersionVo.java | 44 +++ .../com/klp/mapper/WmsProcessPlanMapper.java | 14 + .../mapper/WmsProcessSpecVersionMapper.java | 14 + .../klp/service/IWmsProcessPlanService.java | 29 ++ .../IWmsProcessSpecVersionService.java | 34 ++ .../impl/WmsProcessPlanServiceImpl.java | 107 +++++ .../impl/WmsProcessSpecServiceImpl.java | 11 +- .../WmsProcessSpecVersionServiceImpl.java | 149 +++++++ .../mapper/klp/WmsProcessPlanMapper.xml | 21 + .../klp/WmsProcessSpecVersionMapper.xml | 19 + 22 files changed, 1357 insertions(+), 2 deletions(-) create mode 100644 klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql create mode 100644 klp-ui/src/api/wms/processPlan.js create mode 100644 klp-ui/src/api/wms/processSpecVersion.js create mode 100644 klp-ui/src/views/wms/processSpec/versionManage.vue create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml diff --git a/klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql b/klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql new file mode 100644 index 00000000..0d30157a --- /dev/null +++ b/klp-admin/src/main/resources/db/migration/V11__wms_process_spec_version_plan.sql @@ -0,0 +1,39 @@ +-- 规程版本表 +CREATE TABLE wms_process_spec_version ( + version_id BIGINT NOT NULL COMMENT '主键', + spec_id BIGINT NOT NULL COMMENT '规程主表ID', + version_code VARCHAR(64) NOT NULL COMMENT '版本号', + is_active TINYINT NOT NULL DEFAULT 0 COMMENT '是否当前生效(0否1是)', + status VARCHAR(32) NOT NULL DEFAULT 'DRAFT' COMMENT '状态(DRAFT草稿/PUBLISHED已发布/OBSOLETE作废等)', + create_by VARCHAR(64) NULL COMMENT '创建人', + create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) NULL COMMENT '更新人', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标志(0正常2删除)', + remark VARCHAR(500) NULL COMMENT '备注', + PRIMARY KEY (version_id), + UNIQUE KEY uk_spec_version_code (spec_id, version_code), + KEY idx_spec_version_spec (spec_id), + KEY idx_spec_version_active (spec_id, is_active) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='规程版本表'; + +-- 方案点位表 +CREATE TABLE wms_process_plan ( + plan_id BIGINT NOT NULL COMMENT '主键', + version_id BIGINT NOT NULL COMMENT '规程版本ID', + segment_type VARCHAR(32) NOT NULL COMMENT '段类型(INLET/PROCESS/OUTLET)', + segment_name VARCHAR(100) NULL COMMENT '段名称', + point_name VARCHAR(200) NOT NULL COMMENT '点位名称', + point_code VARCHAR(64) NOT NULL COMMENT '点位编码', + sort_order INT NOT NULL DEFAULT 0 COMMENT '排序', + create_by VARCHAR(64) NULL COMMENT '创建人', + create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) NULL COMMENT '更新人', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标志(0正常2删除)', + remark VARCHAR(500) NULL COMMENT '备注', + PRIMARY KEY (plan_id), + UNIQUE KEY uk_plan_version_point_code (version_id, point_code), + KEY idx_plan_version (version_id), + KEY idx_plan_sort (version_id, sort_order) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='方案点位表'; diff --git a/klp-ui/src/api/wms/processPlan.js b/klp-ui/src/api/wms/processPlan.js new file mode 100644 index 00000000..ae7a25e8 --- /dev/null +++ b/klp-ui/src/api/wms/processPlan.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listProcessPlan(query) { + return request({ + url: '/wms/processPlan/list', + method: 'get', + params: query + }) +} + +export function getProcessPlan(planId) { + return request({ + url: '/wms/processPlan/' + planId, + method: 'get' + }) +} + +export function addProcessPlan(data) { + return request({ + url: '/wms/processPlan', + method: 'post', + data: data + }) +} + +export function updateProcessPlan(data) { + return request({ + url: '/wms/processPlan', + method: 'put', + data: data + }) +} + +export function delProcessPlan(planId) { + return request({ + url: '/wms/processPlan/' + planId, + method: 'delete' + }) +} diff --git a/klp-ui/src/api/wms/processSpecVersion.js b/klp-ui/src/api/wms/processSpecVersion.js new file mode 100644 index 00000000..e77f68f5 --- /dev/null +++ b/klp-ui/src/api/wms/processSpecVersion.js @@ -0,0 +1,46 @@ +import request from '@/utils/request' + +export function listProcessSpecVersion(query) { + return request({ + url: '/wms/processSpecVersion/list', + method: 'get', + params: query + }) +} + +export function getProcessSpecVersion(versionId) { + return request({ + url: '/wms/processSpecVersion/' + versionId, + method: 'get' + }) +} + +export function addProcessSpecVersion(data) { + return request({ + url: '/wms/processSpecVersion', + method: 'post', + data: data + }) +} + +export function updateProcessSpecVersion(data) { + return request({ + url: '/wms/processSpecVersion', + method: 'put', + data: data + }) +} + +export function activateProcessSpecVersion(versionId) { + return request({ + url: '/wms/processSpecVersion/activate/' + versionId, + method: 'put' + }) +} + +export function delProcessSpecVersion(versionId) { + return request({ + url: '/wms/processSpecVersion/' + versionId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/processSpec/index.vue b/klp-ui/src/views/wms/processSpec/index.vue index 68128c8e..8876d2b8 100644 --- a/klp-ui/src/views/wms/processSpec/index.vue +++ b/klp-ui/src/views/wms/processSpec/index.vue @@ -74,8 +74,9 @@ - + @@ -300,6 +301,21 @@ export default { this.download('wms/processSpec/export', { ...this.queryParams }, `processSpec_${new Date().getTime()}.xlsx`) + }, + goVersionManage(row) { + const specId = row.specId + if (specId == null || specId === '') { + this.$modal.msgWarning('无法获取规程ID，请刷新列表后重试') + return + } + // 固定落在「…/processSpec/version」，避免列表为 …/processSpec/list 时拼成 …/list/version 导致路由不匹配、query 丢失 + const pathCurrent = this.$route.path.replace(/\/$/, '') + const m = pathCurrent.match(/^(.*\/processSpec)(?:\/.*)?$/) + const base = m ? m[1] : pathCurrent + this.$router.push({ + path: `${base}/version`, + query: { specId: String(specId) } + }) } } } diff --git a/klp-ui/src/views/wms/processSpec/versionManage.vue b/klp-ui/src/views/wms/processSpec/versionManage.vue new file mode 100644 index 00000000..63734b86 --- /dev/null +++ b/klp-ui/src/views/wms/processSpec/versionManage.vue @@ -0,0 +1,374 @@ + + + diff --git a/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java b/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java new file mode 100644 index 00000000..5af67c19 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanController.java @@ -0,0 +1,75 @@ +package com.klp.controller; + +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +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.page.TableDataInfo; +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.bo.WmsProcessPlanBo; +import com.klp.domain.vo.WmsProcessPlanVo; +import com.klp.service.IWmsProcessPlanService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 方案点位 + * + * @author klp + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/processPlan") +public class WmsProcessPlanController extends BaseController { + + private final IWmsProcessPlanService wmsProcessPlanService; + + @GetMapping("/list") + public TableDataInfo list(WmsProcessPlanBo bo, PageQuery pageQuery) { + return wmsProcessPlanService.queryPageList(bo, pageQuery); + } + + @Log(title = "方案点位", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsProcessPlanBo bo, HttpServletResponse response) { + List list = wmsProcessPlanService.queryList(bo); + ExcelUtil.exportExcel(list, "方案点位", WmsProcessPlanVo.class, response); + } + + @GetMapping("/{planId}") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long planId) { + return R.ok(wmsProcessPlanService.queryById(planId)); + } + + @Log(title = "方案点位", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsProcessPlanBo bo) { + return toAjax(wmsProcessPlanService.insertByBo(bo)); + } + + @Log(title = "方案点位", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsProcessPlanBo bo) { + return toAjax(wmsProcessPlanService.updateByBo(bo)); + } + + @Log(title = "方案点位", businessType = BusinessType.DELETE) + @DeleteMapping("/{planIds}") + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] planIds) { + return toAjax(wmsProcessPlanService.deleteWithValidByIds(Arrays.asList(planIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java b/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java new file mode 100644 index 00000000..10555d45 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsProcessSpecVersionController.java @@ -0,0 +1,85 @@ +package com.klp.controller; + +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +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.page.TableDataInfo; +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.bo.WmsProcessSpecVersionBo; +import com.klp.domain.vo.WmsProcessSpecVersionVo; +import com.klp.service.IWmsProcessSpecVersionService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 规程版本 + * + * @author klp + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/processSpecVersion") +public class WmsProcessSpecVersionController extends BaseController { + + private final IWmsProcessSpecVersionService wmsProcessSpecVersionService; + + @GetMapping("/list") + public TableDataInfo list(WmsProcessSpecVersionBo bo, PageQuery pageQuery) { + return wmsProcessSpecVersionService.queryPageList(bo, pageQuery); + } + + @Log(title = "规程版本", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsProcessSpecVersionBo bo, HttpServletResponse response) { + List list = wmsProcessSpecVersionService.queryList(bo); + ExcelUtil.exportExcel(list, "规程版本", WmsProcessSpecVersionVo.class, response); + } + + @GetMapping("/{versionId}") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long versionId) { + return R.ok(wmsProcessSpecVersionService.queryById(versionId)); + } + + @Log(title = "规程版本", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsProcessSpecVersionBo bo) { + return toAjax(wmsProcessSpecVersionService.insertByBo(bo)); + } + + @Log(title = "规程版本", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsProcessSpecVersionBo bo) { + return toAjax(wmsProcessSpecVersionService.updateByBo(bo)); + } + + /** + * 设为当前生效版本（同规程下仅一条生效） + */ + @Log(title = "规程版本生效", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/activate/{versionId}") + public R activate(@NotNull(message = "主键不能为空") @PathVariable Long versionId) { + return toAjax(wmsProcessSpecVersionService.activateVersion(versionId)); + } + + @Log(title = "规程版本", businessType = BusinessType.DELETE) + @DeleteMapping("/{versionIds}") + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] versionIds) { + return toAjax(wmsProcessSpecVersionService.deleteWithValidByIds(Arrays.asList(versionIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java b/klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java new file mode 100644 index 00000000..05cb2169 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsProcessPlan.java @@ -0,0 +1,59 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 方案点位对象 wms_process_plan + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_process_plan") +public class WmsProcessPlan extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId(value = "plan_id") + private Long planId; + + /** + * 规程版本ID + */ + private Long versionId; + + /** + * 段类型（INLET/PROCESS/OUTLET） + */ + private String segmentType; + + /** + * 段名称 + */ + private String segmentName; + + /** + * 点位名称 + */ + private String pointName; + + /** + * 点位编码 + */ + private String pointCode; + + /** + * 排序 + */ + private Integer sortOrder; + + @TableLogic + private Integer delFlag; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java b/klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java new file mode 100644 index 00000000..f088ec17 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsProcessSpecVersion.java @@ -0,0 +1,49 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 规程版本对象 wms_process_spec_version + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_process_spec_version") +public class WmsProcessSpecVersion extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId(value = "version_id") + private Long versionId; + + /** + * 规程主表ID + */ + private Long specId; + + /** + * 版本号 + */ + private String versionCode; + + /** + * 是否当前生效（0=否，1=是） + */ + private Integer isActive; + + /** + * 状态 + */ + private String status; + + @TableLogic + private Integer delFlag; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java new file mode 100644 index 00000000..2c38acad --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanBo.java @@ -0,0 +1,42 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 方案点位业务对象 wms_process_plan + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsProcessPlanBo extends BaseEntity { + + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long planId; + + @NotNull(message = "版本不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long versionId; + + @NotBlank(message = "段类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private String segmentType; + + private String segmentName; + + @NotBlank(message = "点位名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String pointName; + + @NotBlank(message = "点位编码不能为空", groups = {AddGroup.class, EditGroup.class}) + private String pointCode; + + @NotNull(message = "排序不能为空", groups = {AddGroup.class, EditGroup.class}) + private Integer sortOrder; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java new file mode 100644 index 00000000..b016f3b6 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessSpecVersionBo.java @@ -0,0 +1,41 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 规程版本业务对象 wms_process_spec_version + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsProcessSpecVersionBo extends BaseEntity { + + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long versionId; + + @NotNull(message = "规程不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long specId; + + @NotBlank(message = "版本号不能为空", groups = {AddGroup.class, EditGroup.class}) + private String versionCode; + + /** + * 是否当前生效（0=否，1=是） + */ + private Integer isActive; + + /** + * 状态 + */ + private String status; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java new file mode 100644 index 00000000..a21cc52b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanVo.java @@ -0,0 +1,50 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 方案点位视图对象 wms_process_plan + * + * @author klp + */ +@Data +@ExcelIgnoreUnannotated +public class WmsProcessPlanVo { + + @ExcelProperty(value = "方案点位ID") + private Long planId; + + @ExcelProperty(value = "版本ID") + private Long versionId; + + @ExcelProperty(value = "段类型") + private String segmentType; + + @ExcelProperty(value = "段名称") + private String segmentName; + + @ExcelProperty(value = "点位名称") + private String pointName; + + @ExcelProperty(value = "点位编码") + private String pointCode; + + @ExcelProperty(value = "排序") + private Integer sortOrder; + + @ExcelProperty(value = "备注") + private String remark; + + @ExcelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ExcelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java new file mode 100644 index 00000000..dd3e7224 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessSpecVersionVo.java @@ -0,0 +1,44 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * 规程版本视图对象 wms_process_spec_version + * + * @author klp + */ +@Data +@ExcelIgnoreUnannotated +public class WmsProcessSpecVersionVo { + + @ExcelProperty(value = "版本ID") + private Long versionId; + + @ExcelProperty(value = "规程ID") + private Long specId; + + @ExcelProperty(value = "版本号") + private String versionCode; + + @ExcelProperty(value = "是否生效") + private Integer isActive; + + @ExcelProperty(value = "状态") + private String status; + + @ExcelProperty(value = "备注") + private String remark; + + @ExcelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ExcelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java new file mode 100644 index 00000000..7b3288b3 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanMapper.java @@ -0,0 +1,14 @@ +package com.klp.mapper; + +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.domain.WmsProcessPlan; +import com.klp.domain.vo.WmsProcessPlanVo; + +/** + * 方案点位Mapper + * + * @author klp + */ +public interface WmsProcessPlanMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java new file mode 100644 index 00000000..6089533f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProcessSpecVersionMapper.java @@ -0,0 +1,14 @@ +package com.klp.mapper; + +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.domain.WmsProcessSpecVersion; +import com.klp.domain.vo.WmsProcessSpecVersionVo; + +/** + * 规程版本Mapper + * + * @author klp + */ +public interface WmsProcessSpecVersionMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java b/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java new file mode 100644 index 00000000..8d6b7dd9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanService.java @@ -0,0 +1,29 @@ +package com.klp.service; + +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.domain.bo.WmsProcessPlanBo; +import com.klp.domain.vo.WmsProcessPlanVo; + +import java.util.Collection; +import java.util.List; + +/** + * 方案点位Service + * + * @author klp + */ +public interface IWmsProcessPlanService { + + WmsProcessPlanVo queryById(Long planId); + + TableDataInfo queryPageList(WmsProcessPlanBo bo, PageQuery pageQuery); + + List queryList(WmsProcessPlanBo bo); + + Boolean insertByBo(WmsProcessPlanBo bo); + + Boolean updateByBo(WmsProcessPlanBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java b/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java new file mode 100644 index 00000000..b19ac48d --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsProcessSpecVersionService.java @@ -0,0 +1,34 @@ +package com.klp.service; + +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.domain.bo.WmsProcessSpecVersionBo; +import com.klp.domain.vo.WmsProcessSpecVersionVo; + +import java.util.Collection; +import java.util.List; + +/** + * 规程版本Service + * + * @author klp + */ +public interface IWmsProcessSpecVersionService { + + WmsProcessSpecVersionVo queryById(Long versionId); + + TableDataInfo queryPageList(WmsProcessSpecVersionBo bo, PageQuery pageQuery); + + List queryList(WmsProcessSpecVersionBo bo); + + Boolean insertByBo(WmsProcessSpecVersionBo bo); + + Boolean updateByBo(WmsProcessSpecVersionBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 将指定版本设为当前规程下唯一生效版本 + */ + Boolean activateVersion(Long versionId); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java new file mode 100644 index 00000000..cf72ec47 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java @@ -0,0 +1,107 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsProcessPlan; +import com.klp.domain.WmsProcessSpecVersion; +import com.klp.domain.bo.WmsProcessPlanBo; +import com.klp.domain.vo.WmsProcessPlanVo; +import com.klp.mapper.WmsProcessPlanMapper; +import com.klp.mapper.WmsProcessSpecVersionMapper; +import com.klp.service.IWmsProcessPlanService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 方案点位Service实现 + * + * @author klp + */ +@RequiredArgsConstructor +@Service +public class WmsProcessPlanServiceImpl implements IWmsProcessPlanService { + + private final WmsProcessPlanMapper baseMapper; + private final WmsProcessSpecVersionMapper wmsProcessSpecVersionMapper; + + @Override + public WmsProcessPlanVo queryById(Long planId) { + return baseMapper.selectVoById(planId); + } + + @Override + public TableDataInfo queryPageList(WmsProcessPlanBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(WmsProcessPlanBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsProcessPlanBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getVersionId() != null, WmsProcessPlan::getVersionId, bo.getVersionId()); + lqw.eq(StringUtils.isNotBlank(bo.getSegmentType()), WmsProcessPlan::getSegmentType, bo.getSegmentType()); + lqw.like(StringUtils.isNotBlank(bo.getPointName()), WmsProcessPlan::getPointName, bo.getPointName()); + lqw.eq(StringUtils.isNotBlank(bo.getPointCode()), WmsProcessPlan::getPointCode, bo.getPointCode()); + lqw.orderByAsc(WmsProcessPlan::getSortOrder).orderByAsc(WmsProcessPlan::getPlanId); + return lqw; + } + + @Override + public Boolean insertByBo(WmsProcessPlanBo bo) { + WmsProcessSpecVersion ver = wmsProcessSpecVersionMapper.selectById(bo.getVersionId()); + if (ver == null) { + throw new ServiceException("规程版本不存在"); + } + WmsProcessPlan add = BeanUtil.toBean(bo, WmsProcessPlan.class); + if (add.getSortOrder() == null) { + add.setSortOrder(0); + } + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setPlanId(add.getPlanId()); + } + return flag; + } + + @Override + public Boolean updateByBo(WmsProcessPlanBo bo) { + WmsProcessPlan update = BeanUtil.toBean(bo, WmsProcessPlan.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + private void validEntityBeforeSave(WmsProcessPlan entity) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsProcessPlan::getVersionId, entity.getVersionId()); + lqw.eq(WmsProcessPlan::getPointCode, entity.getPointCode()); + if (entity.getPlanId() != null) { + lqw.ne(WmsProcessPlan::getPlanId, entity.getPlanId()); + } + if (baseMapper.selectCount(lqw) > 0) { + throw new ServiceException("同一版本下点位编码已存在"); + } + } + + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if (Boolean.TRUE.equals(isValid)) { + // 可扩展业务校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java index 6c5b080a..895bc459 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecServiceImpl.java @@ -9,9 +9,11 @@ import com.klp.common.core.page.TableDataInfo; import com.klp.common.exception.ServiceException; import com.klp.common.utils.StringUtils; import com.klp.domain.WmsProcessSpec; +import com.klp.domain.WmsProcessSpecVersion; import com.klp.domain.bo.WmsProcessSpecBo; import com.klp.domain.vo.WmsProcessSpecVo; import com.klp.mapper.WmsProcessSpecMapper; +import com.klp.mapper.WmsProcessSpecVersionMapper; import com.klp.service.IWmsProcessSpecService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -29,6 +31,7 @@ import java.util.List; public class WmsProcessSpecServiceImpl implements IWmsProcessSpecService { private final WmsProcessSpecMapper baseMapper; + private final WmsProcessSpecVersionMapper wmsProcessSpecVersionMapper; @Override public WmsProcessSpecVo queryById(Long specId) { @@ -94,7 +97,13 @@ public class WmsProcessSpecServiceImpl implements IWmsProcessSpecService { @Override public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { if (Boolean.TRUE.equals(isValid)) { - // 任务3 可在此校验版本等从表数据 + for (Long specId : ids) { + LambdaQueryWrapper vq = Wrappers.lambdaQuery(); + vq.eq(WmsProcessSpecVersion::getSpecId, specId); + if (wmsProcessSpecVersionMapper.selectCount(vq) > 0) { + throw new ServiceException("规程下存在版本数据，请先删除版本及方案"); + } + } } return baseMapper.deleteBatchIds(ids) > 0; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java new file mode 100644 index 00000000..af128778 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java @@ -0,0 +1,149 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsProcessSpec; +import com.klp.domain.WmsProcessPlan; +import com.klp.domain.WmsProcessSpecVersion; +import com.klp.domain.bo.WmsProcessSpecVersionBo; +import com.klp.domain.vo.WmsProcessSpecVersionVo; +import com.klp.mapper.WmsProcessPlanMapper; +import com.klp.mapper.WmsProcessSpecMapper; +import com.klp.mapper.WmsProcessSpecVersionMapper; +import com.klp.service.IWmsProcessSpecVersionService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.List; + +/** + * 规程版本Service实现 + * + * @author klp + */ +@RequiredArgsConstructor +@Service +public class WmsProcessSpecVersionServiceImpl implements IWmsProcessSpecVersionService { + + private final WmsProcessSpecVersionMapper baseMapper; + private final WmsProcessSpecMapper wmsProcessSpecMapper; + private final WmsProcessPlanMapper wmsProcessPlanMapper; + + @Override + public WmsProcessSpecVersionVo queryById(Long versionId) { + return baseMapper.selectVoById(versionId); + } + + @Override + public TableDataInfo queryPageList(WmsProcessSpecVersionBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(WmsProcessSpecVersionBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsProcessSpecVersionBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getSpecId() != null, WmsProcessSpecVersion::getSpecId, bo.getSpecId()); + lqw.eq(StringUtils.isNotBlank(bo.getVersionCode()), WmsProcessSpecVersion::getVersionCode, bo.getVersionCode()); + lqw.eq(bo.getIsActive() != null, WmsProcessSpecVersion::getIsActive, bo.getIsActive()); + lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WmsProcessSpecVersion::getStatus, bo.getStatus()); + lqw.orderByDesc(WmsProcessSpecVersion::getCreateTime); + return lqw; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean insertByBo(WmsProcessSpecVersionBo bo) { + WmsProcessSpec spec = wmsProcessSpecMapper.selectById(bo.getSpecId()); + if (spec == null) { + throw new ServiceException("规程不存在"); + } + WmsProcessSpecVersion add = BeanUtil.toBean(bo, WmsProcessSpecVersion.class); + if (add.getIsActive() == null) { + add.setIsActive(0); + } + if (StringUtils.isBlank(add.getStatus())) { + add.setStatus("DRAFT"); + } + validEntityBeforeSave(add); + boolean ok = baseMapper.insert(add) > 0; + if (ok) { + bo.setVersionId(add.getVersionId()); + if (Integer.valueOf(1).equals(add.getIsActive())) { + activateVersion(add.getVersionId()); + } + } + return ok; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean updateByBo(WmsProcessSpecVersionBo bo) { + WmsProcessSpecVersion exist = baseMapper.selectById(bo.getVersionId()); + if (exist == null) { + throw new ServiceException("版本不存在"); + } + WmsProcessSpecVersion update = BeanUtil.toBean(bo, WmsProcessSpecVersion.class); + validEntityBeforeSave(update); + boolean ok = baseMapper.updateById(update) > 0; + if (ok && Integer.valueOf(1).equals(update.getIsActive())) { + activateVersion(update.getVersionId()); + } + return ok; + } + + private void validEntityBeforeSave(WmsProcessSpecVersion entity) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsProcessSpecVersion::getSpecId, entity.getSpecId()); + lqw.eq(WmsProcessSpecVersion::getVersionCode, entity.getVersionCode()); + if (entity.getVersionId() != null) { + lqw.ne(WmsProcessSpecVersion::getVersionId, entity.getVersionId()); + } + if (baseMapper.selectCount(lqw) > 0) { + throw new ServiceException("同一规程下版本号已存在"); + } + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean activateVersion(Long versionId) { + WmsProcessSpecVersion v = baseMapper.selectById(versionId); + if (v == null) { + throw new ServiceException("版本不存在"); + } + LambdaUpdateWrapper clear = Wrappers.lambdaUpdate(); + clear.eq(WmsProcessSpecVersion::getSpecId, v.getSpecId()); + clear.set(WmsProcessSpecVersion::getIsActive, 0); + baseMapper.update(null, clear); + + WmsProcessSpecVersion one = new WmsProcessSpecVersion(); + one.setVersionId(versionId); + one.setIsActive(1); + return baseMapper.updateById(one) > 0; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + for (Long versionId : ids) { + LambdaQueryWrapper pq = Wrappers.lambdaQuery(); + pq.eq(WmsProcessPlan::getVersionId, versionId); + wmsProcessPlanMapper.delete(pq); + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml new file mode 100644 index 00000000..b4e971fe --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml new file mode 100644 index 00000000..72b8a5b2 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsProcessSpecVersionMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + From d61a2c795b02206d608f84d704338b3fe29e49aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E6=98=8A?= <15984991+wwh2328692301@user.noreply.gitee.com> Date: Mon, 20 Apr 2026 19:34:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(wms):=20=E5=A2=9E=E5=BC=BA=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B9=E6=A1=88=E5=8F=82=E6=95=B0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在版本管理页面中，新增方案参数的显示和编辑功能。用户可以通过操作按钮对方案点位和参数进行编辑和删除。后端服务也进行了相应的调整，以支持方案参数的增删改查操作。此更新提升了用户在管理方案时的灵活性和便捷性。 --- .../migration/V12__wms_process_plan_param.sql | 20 ++ klp-ui/src/api/wms/processPlanParam.js | 39 ++++ .../views/wms/processSpec/versionManage.vue | 179 +++++++++++++++++- .../WmsProcessPlanParamController.java | 75 ++++++++ .../com/klp/domain/WmsProcessPlanParam.java | 66 +++++++ .../klp/domain/bo/WmsProcessPlanParamBo.java | 43 +++++ .../klp/domain/vo/WmsProcessPlanParamVo.java | 54 ++++++ .../klp/mapper/WmsProcessPlanParamMapper.java | 14 ++ .../service/IWmsProcessPlanParamService.java | 29 +++ .../impl/WmsProcessPlanParamServiceImpl.java | 100 ++++++++++ .../impl/WmsProcessPlanServiceImpl.java | 8 + .../WmsProcessSpecVersionServiceImpl.java | 9 + .../mapper/klp/WmsProcessPlanParamMapper.xml | 22 +++ 13 files changed, 652 insertions(+), 6 deletions(-) create mode 100644 klp-admin/src/main/resources/db/migration/V12__wms_process_plan_param.sql create mode 100644 klp-ui/src/api/wms/processPlanParam.js create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsProcessPlanParamController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsProcessPlanParam.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanParamBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanParamVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanParamMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsProcessPlanParamService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanParamServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsProcessPlanParamMapper.xml diff --git a/klp-admin/src/main/resources/db/migration/V12__wms_process_plan_param.sql b/klp-admin/src/main/resources/db/migration/V12__wms_process_plan_param.sql new file mode 100644 index 00000000..19c715fc --- /dev/null +++ b/klp-admin/src/main/resources/db/migration/V12__wms_process_plan_param.sql @@ -0,0 +1,20 @@ +-- 方案参数表 +CREATE TABLE wms_process_plan_param ( + param_id BIGINT NOT NULL COMMENT '主键', + plan_id BIGINT NOT NULL COMMENT '方案点位ID', + param_code VARCHAR(64) NOT NULL COMMENT '参数编码', + param_name VARCHAR(200) NOT NULL COMMENT '参数名称', + target_value DECIMAL(24, 6) NULL COMMENT '设定值', + lower_limit DECIMAL(24, 6) NULL COMMENT '下限', + upper_limit DECIMAL(24, 6) NULL COMMENT '上限', + unit VARCHAR(32) NULL COMMENT '单位', + create_by VARCHAR(64) NULL COMMENT '创建人', + create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + update_by VARCHAR(64) NULL COMMENT '更新人', + update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + del_flag TINYINT NOT NULL DEFAULT 0 COMMENT '删除标志(0正常2删除)', + remark VARCHAR(500) NULL COMMENT '备注', + PRIMARY KEY (param_id), + UNIQUE KEY uk_plan_param_code (plan_id, param_code), + KEY idx_plan_param_plan (plan_id) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='方案参数表'; diff --git a/klp-ui/src/api/wms/processPlanParam.js b/klp-ui/src/api/wms/processPlanParam.js new file mode 100644 index 00000000..fe26cc67 --- /dev/null +++ b/klp-ui/src/api/wms/processPlanParam.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export function listProcessPlanParam(query) { + return request({ + url: '/wms/processPlanParam/list', + method: 'get', + params: query + }) +} + +export function getProcessPlanParam(paramId) { + return request({ + url: '/wms/processPlanParam/' + paramId, + method: 'get' + }) +} + +export function addProcessPlanParam(data) { + return request({ + url: '/wms/processPlanParam', + method: 'post', + data: data + }) +} + +export function updateProcessPlanParam(data) { + return request({ + url: '/wms/processPlanParam', + method: 'put', + data: data + }) +} + +export function delProcessPlanParam(paramId) { + return request({ + url: '/wms/processPlanParam/' + paramId, + method: 'delete' + }) +} diff --git a/klp-ui/src/views/wms/processSpec/versionManage.vue b/klp-ui/src/views/wms/processSpec/versionManage.vue index 63734b86..642416b2 100644 --- a/klp-ui/src/views/wms/processSpec/versionManage.vue +++ b/klp-ui/src/views/wms/processSpec/versionManage.vue @@ -58,22 +58,49 @@ 方案点位（版本 {{ selectedVersion.versionCode }}） 新建方案点位 - + - + - + +
+ 方案参数（{{ selectedPlan.pointName || selectedPlan.pointCode }}） + 新建参数 +
+ + + + + + + + + + + + + + @@ -131,6 +158,37 @@ 取 消 + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ @@ -144,6 +202,7 @@ import { activateProcessSpecVersion } from '@/api/wms/processSpecVersion' import { listProcessPlan, addProcessPlan, updateProcessPlan, delProcessPlan } from '@/api/wms/processPlan' +import { listProcessPlanParam, addProcessPlanParam, updateProcessPlanParam, delProcessPlanParam } from '@/api/wms/processPlanParam' export default { name: 'ProcessSpecVersionManage', @@ -156,6 +215,9 @@ export default { selectedVersion: null, planList: [], planLoading: false, + selectedPlan: null, + paramList: [], + paramLoading: false, statusOptions: ['DRAFT', 'PUBLISHED', 'OBSOLETE'], segmentOptions: [ { label: '入口', value: 'INLET' }, @@ -182,7 +244,15 @@ export default { }, specPickerId: '', specPickerOptions: [], - specPickerLoading: false + specPickerLoading: false, + paramOpen: false, + paramTitle: '', + paramSubmitLoading: false, + paramForm: {}, + paramRules: { + paramCode: [{ required: true, message: '参数编码不能为空', trigger: 'blur' }], + paramName: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }] + } } }, watch: { @@ -244,6 +314,8 @@ export default { this.versionList = res.rows || [] this.selectedVersion = null this.planList = [] + this.selectedPlan = null + this.paramList = [] }) .catch((e) => { console.error('加载规程版本失败', e) @@ -254,13 +326,23 @@ export default { }, onVersionRowClick(row) { this.selectedVersion = row + this.selectedPlan = null + this.paramList = [] this.loadPlans(row.versionId) }, + onPlanRowClick(row) { + this.selectedPlan = row + this.loadParams(row.planId) + }, loadPlans(versionId) { if (!versionId) { this.planList = [] + this.selectedPlan = null + this.paramList = [] return } + this.selectedPlan = null + this.paramList = [] this.planLoading = true listProcessPlan({ versionId, pageNum: 1, pageSize: 500 }) .then((res) => { @@ -273,6 +355,23 @@ export default { this.planLoading = false }) }, + loadParams(planId) { + if (!planId) { + this.paramList = [] + return + } + this.paramLoading = true + listProcessPlanParam({ planId, pageNum: 1, pageSize: 500 }) + .then((res) => { + this.paramList = res.rows || [] + }) + .catch((e) => { + console.error('加载方案参数失败', e) + }) + .finally(() => { + this.paramLoading = false + }) + }, openVersionDialog(row) { this.versionForm = row ? { ...row } @@ -321,6 +420,8 @@ export default { this.$modal.msgSuccess('删除成功') this.selectedVersion = null this.planList = [] + this.selectedPlan = null + this.paramList = [] this.initPage() }).catch(() => {}) }, @@ -366,8 +467,74 @@ export default { return delProcessPlan(row.planId) }).then(() => { this.$modal.msgSuccess('删除成功') + if (this.selectedPlan && this.selectedPlan.planId === row.planId) { + this.selectedPlan = null + this.paramList = [] + } this.loadPlans(this.selectedVersion.versionId) }).catch(() => {}) + }, + openParamDialog(row) { + if (!this.selectedPlan) { + this.$modal.msgWarning('请先在上方方案点位表格中选中一行') + return + } + this.paramForm = row + ? { ...row } + : { + planId: this.selectedPlan.planId, + paramCode: undefined, + paramName: undefined, + targetValue: undefined, + lowerLimit: undefined, + upperLimit: undefined, + unit: undefined, + remark: undefined + } + this.paramTitle = row ? '编辑方案参数' : '新建方案参数' + this.paramOpen = true + this.$nextTick(() => this.$refs.paramFormRef && this.$refs.paramFormRef.clearValidate()) + }, + parseDecimal(val) { + if (val === undefined || val === null || val === '') { + return undefined + } + const n = Number(val) + return Number.isFinite(n) ? n : undefined + }, + buildParamPayload() { + return { + ...this.paramForm, + targetValue: this.parseDecimal(this.paramForm.targetValue), + lowerLimit: this.parseDecimal(this.paramForm.lowerLimit), + upperLimit: this.parseDecimal(this.paramForm.upperLimit) + } + }, + submitParam() { + this.$refs.paramFormRef.validate((ok) => { + if (!ok) return + this.paramSubmitLoading = true + const payload = this.buildParamPayload() + const req = payload.paramId ? updateProcessPlanParam(payload) : addProcessPlanParam(payload) + req + .then(() => { + this.$modal.msgSuccess('保存成功') + this.paramOpen = false + this.loadParams(this.selectedPlan.planId) + }) + .catch((e) => console.error('保存方案参数失败', e)) + .finally(() => { + this.paramSubmitLoading = false + }) + }) + }, + removeParam(row) { + this.$modal.confirm('确认删除该方案参数？').then(() => { + return delProcessPlanParam(row.paramId) + }).then(() => { + this.$modal.msgSuccess('删除成功') + this.loadParams(this.selectedPlan.planId) + }).catch(() => {}) } } } diff --git a/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanParamController.java b/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanParamController.java new file mode 100644 index 00000000..04ab19c2 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsProcessPlanParamController.java @@ -0,0 +1,75 @@ +package com.klp.controller; + +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +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.page.TableDataInfo; +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.bo.WmsProcessPlanParamBo; +import com.klp.domain.vo.WmsProcessPlanParamVo; +import com.klp.service.IWmsProcessPlanParamService; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; +import java.util.List; + +/** + * 方案参数 + * + * @author klp + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/processPlanParam") +public class WmsProcessPlanParamController extends BaseController { + + private final IWmsProcessPlanParamService wmsProcessPlanParamService; + + @GetMapping("/list") + public TableDataInfo list(WmsProcessPlanParamBo bo, PageQuery pageQuery) { + return wmsProcessPlanParamService.queryPageList(bo, pageQuery); + } + + @Log(title = "方案参数", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsProcessPlanParamBo bo, HttpServletResponse response) { + List list = wmsProcessPlanParamService.queryList(bo); + ExcelUtil.exportExcel(list, "方案参数", WmsProcessPlanParamVo.class, response); + } + + @GetMapping("/{paramId}") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long paramId) { + return R.ok(wmsProcessPlanParamService.queryById(paramId)); + } + + @Log(title = "方案参数", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsProcessPlanParamBo bo) { + return toAjax(wmsProcessPlanParamService.insertByBo(bo)); + } + + @Log(title = "方案参数", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsProcessPlanParamBo bo) { + return toAjax(wmsProcessPlanParamService.updateByBo(bo)); + } + + @Log(title = "方案参数", businessType = BusinessType.DELETE) + @DeleteMapping("/{paramIds}") + public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] paramIds) { + return toAjax(wmsProcessPlanParamService.deleteWithValidByIds(Arrays.asList(paramIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProcessPlanParam.java b/klp-wms/src/main/java/com/klp/domain/WmsProcessPlanParam.java new file mode 100644 index 00000000..043f9aae --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsProcessPlanParam.java @@ -0,0 +1,66 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 方案参数对象 wms_process_plan_param + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_process_plan_param") +public class WmsProcessPlanParam extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @TableId(value = "param_id") + private Long paramId; + + /** + * 方案点位ID + */ + private Long planId; + + /** + * 参数编码 + */ + private String paramCode; + + /** + * 参数名称 + */ + private String paramName; + + /** + * 设定值 + */ + private BigDecimal targetValue; + + /** + * 下限 + */ + private BigDecimal lowerLimit; + + /** + * 上限 + */ + private BigDecimal upperLimit; + + /** + * 单位 + */ + private String unit; + + @TableLogic + private Integer delFlag; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanParamBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanParamBo.java new file mode 100644 index 00000000..76210db9 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanParamBo.java @@ -0,0 +1,43 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * 方案参数业务对象 wms_process_plan_param + * + * @author klp + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsProcessPlanParamBo extends BaseEntity { + + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long paramId; + + @NotNull(message = "方案点位不能为空", groups = {AddGroup.class, EditGroup.class}) + private Long planId; + + @NotBlank(message = "参数编码不能为空", groups = {AddGroup.class, EditGroup.class}) + private String paramCode; + + @NotBlank(message = "参数名称不能为空", groups = {AddGroup.class, EditGroup.class}) + private String paramName; + + private BigDecimal targetValue; + + private BigDecimal lowerLimit; + + private BigDecimal upperLimit; + + private String unit; + + private String remark; +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanParamVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanParamVo.java new file mode 100644 index 00000000..d54d9b0f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanParamVo.java @@ -0,0 +1,54 @@ +package com.klp.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 方案参数视图对象 wms_process_plan_param + * + * @author klp + */ +@Data +@ExcelIgnoreUnannotated +public class WmsProcessPlanParamVo { + + @ExcelProperty(value = "参数ID") + private Long paramId; + + @ExcelProperty(value = "方案点位ID") + private Long planId; + + @ExcelProperty(value = "参数编码") + private String paramCode; + + @ExcelProperty(value = "参数名称") + private String paramName; + + @ExcelProperty(value = "设定值") + private BigDecimal targetValue; + + @ExcelProperty(value = "下限") + private BigDecimal lowerLimit; + + @ExcelProperty(value = "上限") + private BigDecimal upperLimit; + + @ExcelProperty(value = "单位") + private String unit; + + @ExcelProperty(value = "备注") + private String remark; + + @ExcelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ExcelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanParamMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanParamMapper.java new file mode 100644 index 00000000..85e06e91 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanParamMapper.java @@ -0,0 +1,14 @@ +package com.klp.mapper; + +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.domain.WmsProcessPlanParam; +import com.klp.domain.vo.WmsProcessPlanParamVo; + +/** + * 方案参数Mapper + * + * @author klp + */ +public interface WmsProcessPlanParamMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanParamService.java b/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanParamService.java new file mode 100644 index 00000000..ee6a65e8 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsProcessPlanParamService.java @@ -0,0 +1,29 @@ +package com.klp.service; + +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.domain.bo.WmsProcessPlanParamBo; +import com.klp.domain.vo.WmsProcessPlanParamVo; + +import java.util.Collection; +import java.util.List; + +/** + * 方案参数Service + * + * @author klp + */ +public interface IWmsProcessPlanParamService { + + WmsProcessPlanParamVo queryById(Long paramId); + + TableDataInfo queryPageList(WmsProcessPlanParamBo bo, PageQuery pageQuery); + + List queryList(WmsProcessPlanParamBo bo); + + Boolean insertByBo(WmsProcessPlanParamBo bo); + + Boolean updateByBo(WmsProcessPlanParamBo bo); + + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanParamServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanParamServiceImpl.java new file mode 100644 index 00000000..de4cdfa0 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanParamServiceImpl.java @@ -0,0 +1,100 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsProcessPlan; +import com.klp.domain.WmsProcessPlanParam; +import com.klp.domain.bo.WmsProcessPlanParamBo; +import com.klp.domain.vo.WmsProcessPlanParamVo; +import com.klp.mapper.WmsProcessPlanMapper; +import com.klp.mapper.WmsProcessPlanParamMapper; +import com.klp.service.IWmsProcessPlanParamService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.List; + +/** + * 方案参数Service实现 + * + * @author klp + */ +@RequiredArgsConstructor +@Service +public class WmsProcessPlanParamServiceImpl implements IWmsProcessPlanParamService { + + private final WmsProcessPlanParamMapper baseMapper; + private final WmsProcessPlanMapper wmsProcessPlanMapper; + + @Override + public WmsProcessPlanParamVo queryById(Long paramId) { + return baseMapper.selectVoById(paramId); + } + + @Override + public TableDataInfo queryPageList(WmsProcessPlanParamBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + @Override + public List queryList(WmsProcessPlanParamBo bo) { + return baseMapper.selectVoList(buildQueryWrapper(bo)); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsProcessPlanParamBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getPlanId() != null, WmsProcessPlanParam::getPlanId, bo.getPlanId()); + lqw.eq(StringUtils.isNotBlank(bo.getParamCode()), WmsProcessPlanParam::getParamCode, bo.getParamCode()); + lqw.like(StringUtils.isNotBlank(bo.getParamName()), WmsProcessPlanParam::getParamName, bo.getParamName()); + lqw.orderByAsc(WmsProcessPlanParam::getParamId); + return lqw; + } + + @Override + public Boolean insertByBo(WmsProcessPlanParamBo bo) { + WmsProcessPlan plan = wmsProcessPlanMapper.selectById(bo.getPlanId()); + if (plan == null) { + throw new ServiceException("方案点位不存在"); + } + WmsProcessPlanParam add = BeanUtil.toBean(bo, WmsProcessPlanParam.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setParamId(add.getParamId()); + } + return flag; + } + + @Override + public Boolean updateByBo(WmsProcessPlanParamBo bo) { + WmsProcessPlanParam update = BeanUtil.toBean(bo, WmsProcessPlanParam.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + private void validEntityBeforeSave(WmsProcessPlanParam entity) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsProcessPlanParam::getPlanId, entity.getPlanId()); + lqw.eq(WmsProcessPlanParam::getParamCode, entity.getParamCode()); + if (entity.getParamId() != null) { + lqw.ne(WmsProcessPlanParam::getParamId, entity.getParamId()); + } + if (baseMapper.selectCount(lqw) > 0) { + throw new ServiceException("同一方案点位下参数编码已存在"); + } + } + + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java index cf72ec47..e9df2f19 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java @@ -9,10 +9,12 @@ import com.klp.common.core.page.TableDataInfo; import com.klp.common.exception.ServiceException; import com.klp.common.utils.StringUtils; import com.klp.domain.WmsProcessPlan; +import com.klp.domain.WmsProcessPlanParam; import com.klp.domain.WmsProcessSpecVersion; import com.klp.domain.bo.WmsProcessPlanBo; import com.klp.domain.vo.WmsProcessPlanVo; import com.klp.mapper.WmsProcessPlanMapper; +import com.klp.mapper.WmsProcessPlanParamMapper; import com.klp.mapper.WmsProcessSpecVersionMapper; import com.klp.service.IWmsProcessPlanService; import lombok.RequiredArgsConstructor; @@ -32,6 +34,7 @@ public class WmsProcessPlanServiceImpl implements IWmsProcessPlanService { private final WmsProcessPlanMapper baseMapper; private final WmsProcessSpecVersionMapper wmsProcessSpecVersionMapper; + private final WmsProcessPlanParamMapper wmsProcessPlanParamMapper; @Override public WmsProcessPlanVo queryById(Long planId) { @@ -102,6 +105,11 @@ public class WmsProcessPlanServiceImpl implements IWmsProcessPlanService { if (Boolean.TRUE.equals(isValid)) { // 可扩展业务校验 } + for (Long planId : ids) { + LambdaQueryWrapper pq = Wrappers.lambdaQuery(); + pq.eq(WmsProcessPlanParam::getPlanId, planId); + wmsProcessPlanParamMapper.delete(pq); + } return baseMapper.deleteBatchIds(ids) > 0; } } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java index af128778..dfcfafc5 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java @@ -11,10 +11,12 @@ import com.klp.common.exception.ServiceException; import com.klp.common.utils.StringUtils; import com.klp.domain.WmsProcessSpec; import com.klp.domain.WmsProcessPlan; +import com.klp.domain.WmsProcessPlanParam; import com.klp.domain.WmsProcessSpecVersion; import com.klp.domain.bo.WmsProcessSpecVersionBo; import com.klp.domain.vo.WmsProcessSpecVersionVo; import com.klp.mapper.WmsProcessPlanMapper; +import com.klp.mapper.WmsProcessPlanParamMapper; import com.klp.mapper.WmsProcessSpecMapper; import com.klp.mapper.WmsProcessSpecVersionMapper; import com.klp.service.IWmsProcessSpecVersionService; @@ -37,6 +39,7 @@ public class WmsProcessSpecVersionServiceImpl implements IWmsProcessSpecVersionS private final WmsProcessSpecVersionMapper baseMapper; private final WmsProcessSpecMapper wmsProcessSpecMapper; private final WmsProcessPlanMapper wmsProcessPlanMapper; + private final WmsProcessPlanParamMapper wmsProcessPlanParamMapper; @Override public WmsProcessSpecVersionVo queryById(Long versionId) { @@ -142,6 +145,12 @@ public class WmsProcessSpecVersionServiceImpl implements IWmsProcessSpecVersionS for (Long versionId : ids) { LambdaQueryWrapper pq = Wrappers.lambdaQuery(); pq.eq(WmsProcessPlan::getVersionId, versionId); + List plans = wmsProcessPlanMapper.selectList(pq); + for (WmsProcessPlan plan : plans) { + LambdaQueryWrapper pr = Wrappers.lambdaQuery(); + pr.eq(WmsProcessPlanParam::getPlanId, plan.getPlanId()); + wmsProcessPlanParamMapper.delete(pr); + } wmsProcessPlanMapper.delete(pq); } return baseMapper.deleteBatchIds(ids) > 0; diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanParamMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanParamMapper.xml new file mode 100644 index 00000000..76e64097 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsProcessPlanParamMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + +