feat(wms): 增强版本管理界面,添加方案参数功能
在版本管理页面中,新增方案参数的显示和编辑功能。用户可以通过操作按钮对方案点位和参数进行编辑和删除。后端服务也进行了相应的调整,以支持方案参数的增删改查操作。此更新提升了用户在管理方案时的灵活性和便捷性。
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user