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

feat(flow): 添加工序定义和步骤明细功能模块

Browse Source 
- 创建工序定义主服务接口及实现类
- 创建工序步骤明细服务接口及实现类
- 添加工序定义主控制器提供CRUD操作接口
- 添加工序步骤明细控制器提供CRUD操作接口
- 创建工序定义主和步骤明细的数据实体类
- 创建工序定义主和步骤明细的业务对象类
- 创建工序定义主和步骤明细的视图对象类
- 添加工序定义主和步骤明细的数据访问层
- 更新元数据配置文件将actionType字段名改为actionId
- 更新前端调度界面使用新的actionId字段进行工序类型映射
- 在排程明细表中添加工序关联字段processId
- 完善前后端数据交互和验证逻辑
This commit is contained in:
Joshi
2026-07-03 16:26:59 +08:00
parent ad46667847
commit b8d3af67e7
28 changed files with 936 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
klp-flow/src/main/java/com/klp/flow/service/ISchProdProcessService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.SchProdProcess;
import com.klp.flow.domain.vo.SchProdProcessVo;
import com.klp.flow.domain.bo.SchProdProcessBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 工序定义主Service接口
*
* @author klp
* @date 2026-07-03
*/
public interface ISchProdProcessService {
/**
* 查询工序定义主
*/
SchProdProcessVo queryById(Long processId);
/**
* 查询工序定义主列表
*/
TableDataInfo<SchProdProcessVo> queryPageList(SchProdProcessBo bo, PageQuery pageQuery);
/**
* 查询工序定义主列表
*/
List<SchProdProcessVo> queryList(SchProdProcessBo bo);
/**
* 新增工序定义主
*/
Boolean insertByBo(SchProdProcessBo bo);
/**
* 修改工序定义主
*/
Boolean updateByBo(SchProdProcessBo bo);
/**
* 校验并批量删除工序定义主信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

49
klp-flow/src/main/java/com/klp/flow/service/ISchProdProcessStepService.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.flow.service;
import com.klp.flow.domain.SchProdProcessStep;
import com.klp.flow.domain.vo.SchProdProcessStepVo;
import com.klp.flow.domain.bo.SchProdProcessStepBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 工序步骤明细Service接口
*
* @author klp
* @date 2026-07-03
*/
public interface ISchProdProcessStepService {
/**
* 查询工序步骤明细
*/
SchProdProcessStepVo queryById(Long stepId);
/**
* 查询工序步骤明细列表
*/
TableDataInfo<SchProdProcessStepVo> queryPageList(SchProdProcessStepBo bo, PageQuery pageQuery);
/**
* 查询工序步骤明细列表
*/
List<SchProdProcessStepVo> queryList(SchProdProcessStepBo bo);
/**
* 新增工序步骤明细
*/
Boolean insertByBo(SchProdProcessStepBo bo);
/**
* 修改工序步骤明细
*/
Boolean updateByBo(SchProdProcessStepBo bo);
/**
* 校验并批量删除工序步骤明细信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

110
klp-flow/src/main/java/com/klp/flow/service/impl/SchProdProcessServiceImpl.java Normal file
View File

@@ -0,0 +1,110 @@
package com.klp.flow.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.flow.domain.bo.SchProdProcessBo;
import com.klp.flow.domain.vo.SchProdProcessVo;
import com.klp.flow.domain.SchProdProcess;
import com.klp.flow.mapper.SchProdProcessMapper;
import com.klp.flow.service.ISchProdProcessService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 工序定义主Service业务层处理
*
* @author klp
* @date 2026-07-03
*/
@RequiredArgsConstructor
@Service
public class SchProdProcessServiceImpl implements ISchProdProcessService {
private final SchProdProcessMapper baseMapper;
/**
* 查询工序定义主
*/
@Override
public SchProdProcessVo queryById(Long processId){
return baseMapper.selectVoById(processId);
}
/**
* 查询工序定义主列表
*/
@Override
public TableDataInfo<SchProdProcessVo> queryPageList(SchProdProcessBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SchProdProcess> lqw = buildQueryWrapper(bo);
Page<SchProdProcessVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询工序定义主列表
*/
@Override
public List<SchProdProcessVo> queryList(SchProdProcessBo bo) {
LambdaQueryWrapper<SchProdProcess> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SchProdProcess> buildQueryWrapper(SchProdProcessBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SchProdProcess> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getProcessName()), SchProdProcess::getProcessName, bo.getProcessName());
lqw.eq(StringUtils.isNotBlank(bo.getProcessDesc()), SchProdProcess::getProcessDesc, bo.getProcessDesc());
return lqw;
}
/**
* 新增工序定义主
*/
@Override
public Boolean insertByBo(SchProdProcessBo bo) {
SchProdProcess add = BeanUtil.toBean(bo, SchProdProcess.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setProcessId(add.getProcessId());
}
return flag;
}
/**
* 修改工序定义主
*/
@Override
public Boolean updateByBo(SchProdProcessBo bo) {
SchProdProcess update = BeanUtil.toBean(bo, SchProdProcess.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SchProdProcess entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除工序定义主
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

111
klp-flow/src/main/java/com/klp/flow/service/impl/SchProdProcessStepServiceImpl.java Normal file
View File

@@ -0,0 +1,111 @@
package com.klp.flow.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.klp.flow.domain.bo.SchProdProcessStepBo;
import com.klp.flow.domain.vo.SchProdProcessStepVo;
import com.klp.flow.domain.SchProdProcessStep;
import com.klp.flow.mapper.SchProdProcessStepMapper;
import com.klp.flow.service.ISchProdProcessStepService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 工序步骤明细Service业务层处理
*
* @author klp
* @date 2026-07-03
*/
@RequiredArgsConstructor
@Service
public class SchProdProcessStepServiceImpl implements ISchProdProcessStepService {
private final SchProdProcessStepMapper baseMapper;
/**
* 查询工序步骤明细
*/
@Override
public SchProdProcessStepVo queryById(Long stepId){
return baseMapper.selectVoById(stepId);
}
/**
* 查询工序步骤明细列表
*/
@Override
public TableDataInfo<SchProdProcessStepVo> queryPageList(SchProdProcessStepBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<SchProdProcessStep> lqw = buildQueryWrapper(bo);
Page<SchProdProcessStepVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询工序步骤明细列表
*/
@Override
public List<SchProdProcessStepVo> queryList(SchProdProcessStepBo bo) {
LambdaQueryWrapper<SchProdProcessStep> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<SchProdProcessStep> buildQueryWrapper(SchProdProcessStepBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SchProdProcessStep> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getProcessId() != null, SchProdProcessStep::getProcessId, bo.getProcessId());
lqw.eq(bo.getStepOrder() != null, SchProdProcessStep::getStepOrder, bo.getStepOrder());
lqw.like(StringUtils.isNotBlank(bo.getStepName()), SchProdProcessStep::getStepName, bo.getStepName());
return lqw;
}
/**
* 新增工序步骤明细
*/
@Override
public Boolean insertByBo(SchProdProcessStepBo bo) {
SchProdProcessStep add = BeanUtil.toBean(bo, SchProdProcessStep.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setStepId(add.getStepId());
}
return flag;
}
/**
* 修改工序步骤明细
*/
@Override
public Boolean updateByBo(SchProdProcessStepBo bo) {
SchProdProcessStep update = BeanUtil.toBean(bo, SchProdProcessStep.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(SchProdProcessStep entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 批量删除工序步骤明细
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;
}
}

1
klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleDetailServiceImpl.java
View File

@@ -99,6 +99,7 @@ public class SchProdScheduleDetailServiceImpl implements ISchProdScheduleDetailS
LambdaQueryWrapper<SchProdScheduleDetail> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getScheduleId() != null, SchProdScheduleDetail::getScheduleId, bo.getScheduleId());
lqw.eq(bo.getOrderDetailId() != null, SchProdScheduleDetail::getOrderDetailId, bo.getOrderDetailId());
lqw.eq(bo.getProcessId() != null, SchProdScheduleDetail::getProcessId, bo.getProcessId());
lqw.eq(StringUtils.isNotBlank(bo.getSpec()), SchProdScheduleDetail::getSpec, bo.getSpec());
lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), SchProdScheduleDetail::getMaterial, bo.getMaterial());
lqw.eq(bo.getScheduleWeight() != null, SchProdScheduleDetail::getScheduleWeight, bo.getScheduleWeight());

4
klp-flow/src/main/java/com/klp/flow/service/impl/SchProdScheduleItemServiceImpl.java
View File

@@ -108,8 +108,8 @@ public class SchProdScheduleItemServiceImpl implements ISchProdScheduleItemServi
lqw.eq(bo.getScheduleWeight() != null, SchProdScheduleItem::getScheduleWeight, bo.getScheduleWeight());
lqw.eq(StringUtils.isNotBlank(bo.getProductItem()), SchProdScheduleItem::getProductItem, bo.getProductItem());
lqw.eq(StringUtils.isNotBlank(bo.getRowRemark()), SchProdScheduleItem::getRowRemark, bo.getRowRemark());
// actionType
lqw.eq(StringUtils.isNotBlank(bo.getActionType()), SchProdScheduleItem::getActionType, bo.getActionType());
// actionId
lqw.eq(bo.getActionId() != null, SchProdScheduleItem::getActionId, bo.getActionId());
return lqw;
}