DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 增强版本管理界面，添加方案参数功能

Browse Source 
在版本管理页面中，新增方案参数的显示和编辑功能。用户可以通过操作按钮对方案点位和参数进行编辑和删除。后端服务也进行了相应的调整，以支持方案参数的增删改查操作。此更新提升了用户在管理方案时的灵活性和便捷性。
This commit is contained in:
王文昊
2026-04-20 19:34:01 +08:00
parent f501994da6
commit d61a2c795b
13 changed files with 652 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
klp-wms/src/main/java/com/klp/controller/WmsProcessPlanParamController.java Normal file
View File

@@ -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<WmsProcessPlanParamVo> 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<WmsProcessPlanParamVo> list = wmsProcessPlanParamService.queryList(bo);
ExcelUtil.exportExcel(list, "方案参数", WmsProcessPlanParamVo.class, response);
}
@GetMapping("/{paramId}")
public R<WmsProcessPlanParamVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long paramId) {
return R.ok(wmsProcessPlanParamService.queryById(paramId));
}
@Log(title = "方案参数", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsProcessPlanParamBo bo) {
return toAjax(wmsProcessPlanParamService.insertByBo(bo));
}
@Log(title = "方案参数", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsProcessPlanParamBo bo) {
return toAjax(wmsProcessPlanParamService.updateByBo(bo));
}
@Log(title = "方案参数", businessType = BusinessType.DELETE)
@DeleteMapping("/{paramIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] paramIds) {
return toAjax(wmsProcessPlanParamService.deleteWithValidByIds(Arrays.asList(paramIds), true));
}
}

66
klp-wms/src/main/java/com/klp/domain/WmsProcessPlanParam.java Normal file
View File

@@ -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;
}

43
klp-wms/src/main/java/com/klp/domain/bo/WmsProcessPlanParamBo.java Normal file
View File

@@ -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;
}

54
klp-wms/src/main/java/com/klp/domain/vo/WmsProcessPlanParamVo.java Normal file
View File

@@ -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;
}

14
klp-wms/src/main/java/com/klp/mapper/WmsProcessPlanParamMapper.java Normal file
View File

@@ -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<WmsProcessPlanParamMapper, WmsProcessPlanParam, WmsProcessPlanParamVo> {
}

29
klp-wms/src/main/java/com/klp/service/IWmsProcessPlanParamService.java Normal file
View File

@@ -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<WmsProcessPlanParamVo> queryPageList(WmsProcessPlanParamBo bo, PageQuery pageQuery);
List<WmsProcessPlanParamVo> queryList(WmsProcessPlanParamBo bo);
Boolean insertByBo(WmsProcessPlanParamBo bo);
Boolean updateByBo(WmsProcessPlanParamBo bo);
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

100
klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanParamServiceImpl.java Normal file
View File

@@ -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<WmsProcessPlanParamVo> queryPageList(WmsProcessPlanParamBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsProcessPlanParam> lqw = buildQueryWrapper(bo);
Page<WmsProcessPlanParamVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public List<WmsProcessPlanParamVo> queryList(WmsProcessPlanParamBo bo) {
return baseMapper.selectVoList(buildQueryWrapper(bo));
}
private LambdaQueryWrapper<WmsProcessPlanParam> buildQueryWrapper(WmsProcessPlanParamBo bo) {
LambdaQueryWrapper<WmsProcessPlanParam> 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<WmsProcessPlanParam> 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<Long> ids, Boolean isValid) {
return baseMapper.deleteBatchIds(ids) > 0;
}
}

8
klp-wms/src/main/java/com/klp/service/impl/WmsProcessPlanServiceImpl.java
View File

@@ -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<WmsProcessPlanParam> pq = Wrappers.lambdaQuery();
pq.eq(WmsProcessPlanParam::getPlanId, planId);
wmsProcessPlanParamMapper.delete(pq);
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

9
klp-wms/src/main/java/com/klp/service/impl/WmsProcessSpecVersionServiceImpl.java
View File

@@ -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<WmsProcessPlan> pq = Wrappers.lambdaQuery();
pq.eq(WmsProcessPlan::getVersionId, versionId);
List<WmsProcessPlan> plans = wmsProcessPlanMapper.selectList(pq);
for (WmsProcessPlan plan : plans) {
LambdaQueryWrapper<WmsProcessPlanParam> pr = Wrappers.lambdaQuery();
pr.eq(WmsProcessPlanParam::getPlanId, plan.getPlanId());
wmsProcessPlanParamMapper.delete(pr);
}
wmsProcessPlanMapper.delete(pq);
}
return baseMapper.deleteBatchIds(ids) > 0;

22
klp-wms/src/main/resources/mapper/klp/WmsProcessPlanParamMapper.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.mapper.WmsProcessPlanParamMapper">
<resultMap type="com.klp.domain.WmsProcessPlanParam" id="WmsProcessPlanParamResult">
<result property="paramId" column="param_id"/>
<result property="planId" column="plan_id"/>
<result property="paramCode" column="param_code"/>
<result property="paramName" column="param_name"/>
<result property="targetValue" column="target_value"/>
<result property="lowerLimit" column="lower_limit"/>
<result property="upperLimit" column="upper_limit"/>
<result property="unit" column="unit"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="remark" column="remark"/>
</resultMap>
</mapper>