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] =?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 @@ + + + + + + + + + + + + + + + + + + + + + +