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

99
klp-flow/src/main/java/com/klp/flow/controller/SchProdProcessController.java Normal file
View File

@@ -0,0 +1,99 @@
package com.klp.flow.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
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.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.flow.domain.vo.SchProdProcessVo;
import com.klp.flow.domain.bo.SchProdProcessBo;
import com.klp.flow.service.ISchProdProcessService;
import com.klp.common.core.page.TableDataInfo;
/**
* 工序定义主
*
* @author klp
* @date 2026-07-03
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/prodProcess")
public class SchProdProcessController extends BaseController {
private final ISchProdProcessService iSchProdProcessService;
/**
* 查询工序定义主列表
*/
@GetMapping("/list")
public TableDataInfo<SchProdProcessVo> list(SchProdProcessBo bo, PageQuery pageQuery) {
return iSchProdProcessService.queryPageList(bo, pageQuery);
}
/**
* 导出工序定义主列表
*/
@Log(title = "工序定义主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SchProdProcessBo bo, HttpServletResponse response) {
List<SchProdProcessVo> list = iSchProdProcessService.queryList(bo);
ExcelUtil.exportExcel(list, "工序定义主", SchProdProcessVo.class, response);
}
/**
* 获取工序定义主详细信息
*
* @param processId 主键
*/
@GetMapping("/{processId}")
public R<SchProdProcessVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long processId) {
return R.ok(iSchProdProcessService.queryById(processId));
}
/**
* 新增工序定义主
*/
@Log(title = "工序定义主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SchProdProcessBo bo) {
return toAjax(iSchProdProcessService.insertByBo(bo));
}
/**
* 修改工序定义主
*/
@Log(title = "工序定义主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchProdProcessBo bo) {
return toAjax(iSchProdProcessService.updateByBo(bo));
}
/**
* 删除工序定义主
*
* @param processIds 主键串
*/
@Log(title = "工序定义主", businessType = BusinessType.DELETE)
@DeleteMapping("/{processIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] processIds) {
return toAjax(iSchProdProcessService.deleteWithValidByIds(Arrays.asList(processIds), true));
}
}

99
klp-flow/src/main/java/com/klp/flow/controller/SchProdProcessStepController.java Normal file
View File

@@ -0,0 +1,99 @@
package com.klp.flow.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
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.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.flow.domain.vo.SchProdProcessStepVo;
import com.klp.flow.domain.bo.SchProdProcessStepBo;
import com.klp.flow.service.ISchProdProcessStepService;
import com.klp.common.core.page.TableDataInfo;
/**
* 工序步骤明细
*
* @author klp
* @date 2026-07-03
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/flow/prodProcessStep")
public class SchProdProcessStepController extends BaseController {
private final ISchProdProcessStepService iSchProdProcessStepService;
/**
* 查询工序步骤明细列表
*/
@GetMapping("/list")
public TableDataInfo<SchProdProcessStepVo> list(SchProdProcessStepBo bo, PageQuery pageQuery) {
return iSchProdProcessStepService.queryPageList(bo, pageQuery);
}
/**
* 导出工序步骤明细列表
*/
@Log(title = "工序步骤明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SchProdProcessStepBo bo, HttpServletResponse response) {
List<SchProdProcessStepVo> list = iSchProdProcessStepService.queryList(bo);
ExcelUtil.exportExcel(list, "工序步骤明细", SchProdProcessStepVo.class, response);
}
/**
* 获取工序步骤明细详细信息
*
* @param stepId 主键
*/
@GetMapping("/{stepId}")
public R<SchProdProcessStepVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long stepId) {
return R.ok(iSchProdProcessStepService.queryById(stepId));
}
/**
* 新增工序步骤明细
*/
@Log(title = "工序步骤明细", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody SchProdProcessStepBo bo) {
return toAjax(iSchProdProcessStepService.insertByBo(bo));
}
/**
* 修改工序步骤明细
*/
@Log(title = "工序步骤明细", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SchProdProcessStepBo bo) {
return toAjax(iSchProdProcessStepService.updateByBo(bo));
}
/**
* 删除工序步骤明细
*
* @param stepIds 主键串
*/
@Log(title = "工序步骤明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{stepIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] stepIds) {
return toAjax(iSchProdProcessStepService.deleteWithValidByIds(Arrays.asList(stepIds), true));
}
}

45
klp-flow/src/main/java/com/klp/flow/domain/SchProdProcess.java Normal file
View File

@@ -0,0 +1,45 @@
package com.klp.flow.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 工序定义主对象 sch_prod_process
*
* @author klp
* @date 2026-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sch_prod_process")
public class SchProdProcess extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 工序主键ID
*/
@TableId(value = "process_id")
private Long processId;
/**
* 工序名称（如：酸扎镀锌毛化流程）
*/
private String processName;
/**
* 工序描述
*/
private String processDesc;
/**
* 备注
*/
private String remark;
/**
* 删除标识 0正常 2删除
*/
@TableLogic
private Long delFlag;
}

49
klp-flow/src/main/java/com/klp/flow/domain/SchProdProcessStep.java Normal file
View File

@@ -0,0 +1,49 @@
package com.klp.flow.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 工序步骤明细对象 sch_prod_process_step
*
* @author klp
* @date 2026-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sch_prod_process_step")
public class SchProdProcessStep extends BaseEntity {
private static final long serialVersionUID=1L;
/**
* 步骤主键ID
*/
@TableId(value = "step_id")
private Long stepId;
/**
* 关联工序主表ID（sch_prod_process.process_id）
*/
private Long processId;
/**
* 步骤顺序号（1,2,3...）
*/
private Long stepOrder;
/**
* 步骤名称（如：酸扎、镀锌、毛化辊、毛化镀锌卷）
*/
private String stepName;
/**
* 备注
*/
private String remark;
/**
* 删除标识 0正常 2删除
*/
@TableLogic
private Long delFlag;
}

4
klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleDetail.java
View File

@@ -33,6 +33,10 @@ public class SchProdScheduleDetail extends BaseEntity {
* 来源销售订单明细ID（溯源原始订单规格）
*/
private Long orderDetailId;
/**
* 关联工序主表ID（sch_prod_process.process_id），表示该明细使用的工序配置
*/
private Long processId;
/**
* 规格 例：1.0X1250
*/

4
klp-flow/src/main/java/com/klp/flow/domain/SchProdScheduleItem.java
View File

@@ -132,9 +132,9 @@ public class SchProdScheduleItem extends BaseEntity {
*/
private String scheduleDetailIds;
/**
* 工序类型
* 工序ID
*/
private String actionType;
private Long actionId;
/**
* 规格 例：1.0X1250
*/

41
klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdProcessBo.java Normal file
View File

@@ -0,0 +1,41 @@
package com.klp.flow.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 工序定义主业务对象 sch_prod_process
*
* @author klp
* @date 2026-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SchProdProcessBo extends BaseEntity {
/**
* 工序主键ID
*/
private Long processId;
/**
* 工序名称（如：酸扎镀锌毛化流程）
*/
private String processName;
/**
* 工序描述
*/
private String processDesc;
/**
* 备注
*/
private String remark;
}

46
klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdProcessStepBo.java Normal file
View File

@@ -0,0 +1,46 @@
package com.klp.flow.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 工序步骤明细业务对象 sch_prod_process_step
*
* @author klp
* @date 2026-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class SchProdProcessStepBo extends BaseEntity {
/**
* 步骤主键ID
*/
private Long stepId;
/**
* 关联工序主表ID（sch_prod_process.process_id）
*/
private Long processId;
/**
* 步骤顺序号（1,2,3...）
*/
private Long stepOrder;
/**
* 步骤名称（如：酸扎、镀锌、毛化辊、毛化镀锌卷）
*/
private String stepName;
/**
* 备注
*/
private String remark;
}

5
klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleDetailBo.java
View File

@@ -33,6 +33,11 @@ public class SchProdScheduleDetailBo extends BaseEntity {
*/
private Long orderDetailId;
/**
* 关联工序主表ID（sch_prod_process.process_id），表示该明细使用的工序配置
*/
private Long processId;
/**
* 规格 例：1.0X1250
*/

4
klp-flow/src/main/java/com/klp/flow/domain/bo/SchProdScheduleItemBo.java
View File

@@ -159,9 +159,9 @@ public class SchProdScheduleItemBo extends BaseEntity {
private String scheduleDetailIds;
/**
* 工序类型
* 工序ID
*/
private String actionType;
private Long actionId;
/**
* 规格 例：1.0X1250

56
klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdProcessStepVo.java Normal file
View File

@@ -0,0 +1,56 @@
package com.klp.flow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 工序步骤明细视图对象 sch_prod_process_step
*
* @author klp
* @date 2026-07-03
*/
@Data
@ExcelIgnoreUnannotated
public class SchProdProcessStepVo {
private static final long serialVersionUID = 1L;
/**
* 步骤主键ID
*/
@ExcelProperty(value = "步骤主键ID")
private Long stepId;
/**
* 关联工序主表ID（sch_prod_process.process_id）
*/
@ExcelProperty(value = "关联工序主表ID", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "s=ch_prod_process.process_id")
private Long processId;
/**
* 步骤顺序号（1,2,3...）
*/
@ExcelProperty(value = "步骤顺序号", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "1=,2,3...")
private Long stepOrder;
/**
* 步骤名称（如：酸扎、镀锌、毛化辊、毛化镀锌卷）
*/
@ExcelProperty(value = "步骤名称", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "如=：酸扎、镀锌、毛化辊、毛化镀锌卷")
private String stepName;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

48
klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdProcessVo.java Normal file
View File

@@ -0,0 +1,48 @@
package com.klp.flow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import lombok.Data;
/**
* 工序定义主视图对象 sch_prod_process
*
* @author klp
* @date 2026-07-03
*/
@Data
@ExcelIgnoreUnannotated
public class SchProdProcessVo {
private static final long serialVersionUID = 1L;
/**
* 工序主键ID
*/
@ExcelProperty(value = "工序主键ID")
private Long processId;
/**
* 工序名称（如：酸扎镀锌毛化流程）
*/
@ExcelProperty(value = "工序名称", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "如=：酸扎镀锌毛化流程")
private String processName;
/**
* 工序描述
*/
@ExcelProperty(value = "工序描述")
private String processDesc;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

6
klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleDetailVo.java
View File

@@ -40,6 +40,12 @@ public class SchProdScheduleDetailVo {
@ExcelDictFormat(readConverterExp = "溯=源原始订单规格")
private Long orderDetailId;
/**
* 关联工序主表ID（sch_prod_process.process_id），表示该明细使用的工序配置
*/
@ExcelProperty(value = "关联工序主表ID")
private Long processId;
/**
* 规格 例：1.0X1250
*/

6
klp-flow/src/main/java/com/klp/flow/domain/vo/SchProdScheduleItemVo.java
View File

@@ -190,10 +190,10 @@ public class SchProdScheduleItemVo {
private String scheduleDetailIds;
/**
* 工序类型
* 工序ID
*/
@ExcelProperty(value = "工序类型")
private String actionType;
@ExcelProperty(value = "工序ID")
private Long actionId;
/**
* 规格 例：1.0X1250

15
klp-flow/src/main/java/com/klp/flow/mapper/SchProdProcessMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.SchProdProcess;
import com.klp.flow.domain.vo.SchProdProcessVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 工序定义主Mapper接口
*
* @author klp
* @date 2026-07-03
*/
public interface SchProdProcessMapper extends BaseMapperPlus<SchProdProcessMapper, SchProdProcess, SchProdProcessVo> {
}

15
klp-flow/src/main/java/com/klp/flow/mapper/SchProdProcessStepMapper.java Normal file
View File

@@ -0,0 +1,15 @@
package com.klp.flow.mapper;
import com.klp.flow.domain.SchProdProcessStep;
import com.klp.flow.domain.vo.SchProdProcessStepVo;
import com.klp.common.core.mapper.BaseMapperPlus;
/**
* 工序步骤明细Mapper接口
*
* @author klp
* @date 2026-07-03
*/
public interface SchProdProcessStepMapper extends BaseMapperPlus<SchProdProcessStepMapper, SchProdProcessStep, SchProdProcessStepVo> {
}

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

20
klp-flow/src/main/resources/mapper/flow/SchProdProcessMapper.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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.flow.mapper.SchProdProcessMapper">
<resultMap type="com.klp.flow.domain.SchProdProcess" id="SchProdProcessResult">
<result property="processId" column="process_id"/>
<result property="processName" column="process_name"/>
<result property="processDesc" column="process_desc"/>
<result property="remark" column="remark"/>
<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"/>
</resultMap>
</mapper>

21
klp-flow/src/main/resources/mapper/flow/SchProdProcessStepMapper.xml Normal file
View File

@@ -0,0 +1,21 @@
<?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.flow.mapper.SchProdProcessStepMapper">
<resultMap type="com.klp.flow.domain.SchProdProcessStep" id="SchProdProcessStepResult">
<result property="stepId" column="step_id"/>
<result property="processId" column="process_id"/>
<result property="stepOrder" column="step_order"/>
<result property="stepName" column="step_name"/>
<result property="remark" column="remark"/>
<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"/>
</resultMap>
</mapper>

1
klp-flow/src/main/resources/mapper/flow/SchProdScheduleDetailMapper.xml
View File

@@ -8,6 +8,7 @@
<result property="scheduleDetailId" column="schedule_detail_id"/>
<result property="scheduleId" column="schedule_id"/>
<result property="orderDetailId" column="order_detail_id"/>
<result property="processId" column="process_id"/>
<result property="spec" column="spec"/>
<result property="material" column="material"/>
<result property="scheduleWeight" column="schedule_weight"/>

4
klp-flow/src/main/resources/mapper/flow/SchProdScheduleItemMapper.xml
View File

@@ -31,8 +31,8 @@
<result property="otherTechReq" column="other_tech_req"/>
<result property="paymentDesc" column="payment_desc"/>
<result property="returnReason" column="return_reason"/>
<result property="scheduleIds" column="schedule_ids"/>
<result property="orderDetailIds" column="order_detail_ids"/>
<result property="scheduleDetailIds" column="schedule_detail_ids"/>
<result property="actionId" column="action_id"/>
<result property="spec" column="spec"/>
<result property="material" column="material"/>
<result property="scheduleWeight" column="schedule_weight"/>

40
klp-ui/src/utils/meta.js
View File

@@ -1,26 +1,26 @@
// lockValue: 锁值，用于防止并发操作，不同的lockValue对应不同的锁
// 1：分步加工 2. 退火 3. 酸轧 4. 酸轧分条 4. 合卷
export const PROCESSES = [
{ name: '酸连轧工序', actionType: 11, api: 'pendingAction', lockValue: 3 },
{ name: '酸轧分条工序', actionType: 120, api: 'pendingAction', lockValue: 4 },
{ name: '酸轧合卷', actionType: 201, api: 'pendingAction', lockValue: 5 },
{ name: '镀锌合卷', actionType: 202, api: 'pendingAction', lockValue: 5 },
{ name: '脱脂合卷', actionType: 203, api: 'pendingAction', lockValue: 5 },
{ name: '拉矫平整合卷', actionType: 204, api: 'pendingAction', lockValue: 5 },
{ name: '双机架合卷', actionType: 205, api: 'pendingAction', lockValue: 5 },
{ name: '镀铬合卷', actionType: 206, api: 'pendingAction', lockValue: 5 },
{ name: '镀锌工序', actionType: 501, api: 'specialSplit', lockValue: 1 },
{ name: '脱脂工序', actionType: 502, api: 'specialSplit', lockValue: 1 },
{ name: '拉矫平整工序', actionType: 503, api: 'specialSplit', lockValue: 1 },
{ name: '双机架工序', actionType: 504, api: 'specialSplit', lockValue: 1 },
{ name: '镀铬工序', actionType: 505, api: 'specialSplit', lockValue: 1 },
{ name: '纵剪分条工序', actionType: 506, api: 'specialSplit', lockValue: 1 },
{ name: '酸轧修复工序', actionType: 520, api: 'specialSplit', lockValue: 1 },
{ name: '镀锌修复工序', actionType: 521, api: 'specialSplit', lockValue: 1 },
{ name: '脱脂修复工序', actionType: 522, api: 'specialSplit', lockValue: 1 },
{ name: '拉矫修复工序', actionType: 523, api: 'specialSplit', lockValue: 1 },
{ name: '双机架修复工序', actionType: 524, api: 'specialSplit', lockValue: 1 },
{ name: '镀铬修复工序', actionType: 525, api: 'specialSplit', lockValue: 1 },
{ name: '酸连轧工序', actionId: 11, api: 'pendingAction', lockValue: 3 },
{ name: '酸轧分条工序', actionId: 120, api: 'pendingAction', lockValue: 4 },
{ name: '酸轧合卷', actionId: 201, api: 'pendingAction', lockValue: 5 },
{ name: '镀锌合卷', actionId: 202, api: 'pendingAction', lockValue: 5 },
{ name: '脱脂合卷', actionId: 203, api: 'pendingAction', lockValue: 5 },
{ name: '拉矫平整合卷', actionId: 204, api: 'pendingAction', lockValue: 5 },
{ name: '双机架合卷', actionId: 205, api: 'pendingAction', lockValue: 5 },
{ name: '镀铬合卷', actionId: 206, api: 'pendingAction', lockValue: 5 },
{ name: '镀锌工序', actionId: 501, api: 'specialSplit', lockValue: 1 },
{ name: '脱脂工序', actionId: 502, api: 'specialSplit', lockValue: 1 },
{ name: '拉矫平整工序', actionId: 503, api: 'specialSplit', lockValue: 1 },
{ name: '双机架工序', actionId: 504, api: 'specialSplit', lockValue: 1 },
{ name: '镀铬工序', actionId: 505, api: 'specialSplit', lockValue: 1 },
{ name: '纵剪分条工序', actionId: 506, api: 'specialSplit', lockValue: 1 },
{ name: '酸轧修复工序', actionId: 520, api: 'specialSplit', lockValue: 1 },
{ name: '镀锌修复工序', actionId: 521, api: 'specialSplit', lockValue: 1 },
{ name: '脱脂修复工序', actionId: 522, api: 'specialSplit', lockValue: 1 },
{ name: '拉矫修复工序', actionId: 523, api: 'specialSplit', lockValue: 1 },
{ name: '双机架修复工序', actionId: 524, api: 'specialSplit', lockValue: 1 },
{ name: '镀铬修复工序', actionId: 525, api: 'specialSplit', lockValue: 1 },
]
export const PRODUCTION_LINES = [

30
klp-ui/src/views/wms/post/aps/schedule.vue
View File

@@ -205,9 +205,9 @@
<el-table-column type="selection" width="45" align="center" />
<el-table-column label="排产单号" prop="scheduleNo" min-width="140" show-overflow-tooltip />
<el-table-column label="生产日期" prop="prodDate" width="110" align="center" show-overflow-tooltip />
<el-table-column label="工序类型" prop="actionType" width="100" align="center" show-overflow-tooltip>
<el-table-column label="工序类型" prop="actionId" width="100" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ getActionTypeName(scope.row.actionType) }}
{{ getActionIdName(scope.row.actionId) }}
</template>
</el-table-column>
<el-table-column label="排产状态" prop="scheduleStatus" width="90" align="center">
@@ -317,8 +317,8 @@
<el-row :gutter="16">
<el-col :span="12">
<el-form-item label="工序类型">
<el-select v-model="editForm.actionType" placeholder="请选择工序类型" clearable filterable style="width:100%">
<el-option v-for="p in processOptions" :key="p.actionType" :label="p.name" :value="p.actionType" />
<el-select v-model="editForm.actionId" placeholder="请选择工序类型" clearable filterable style="width:100%">
<el-option v-for="p in processOptions" :key="p.actionId" :label="p.name" :value="p.actionId" />
</el-select>
</el-form-item>
</el-col>
@@ -528,8 +528,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="工序类型">
<el-select v-model="mergeForm.actionType" placeholder="请选择工序类型" clearable filterable style="width:100%">
<el-option v-for="p in processOptions" :key="p.actionType" :label="p.name" :value="p.actionType" />
<el-select v-model="mergeForm.actionId" placeholder="请选择工序类型" clearable filterable style="width:100%">
<el-option v-for="p in processOptions" :key="p.actionId" :label="p.name" :value="p.actionId" />
</el-select>
</el-form-item>
</el-col>
@@ -687,7 +687,7 @@ export default {
mergeTemplateIndex: 0,
mergeSourceRows: [],
mergeForm: {
itemCount: 0, scheduleNo: '', actionType: '', customerName: '', spec: '', material: '',
itemCount: 0, scheduleNo: '', actionId: '', customerName: '', spec: '', material: '',
scheduleWeight: 0, productType: '', productItem: '', businessUser: '',
businessPhone: '', deliveryCycle: undefined, usePurpose: '',
thicknessTolerance: '', widthTolerance: '', surfaceQuality: '',
@@ -730,7 +730,7 @@ export default {
return {
scheduleId: undefined,
scheduleNo: '',
actionType: '',
actionId: '',
prodDate: '',
scheduleStatus: undefined,
totalPlanWeight: undefined,
@@ -891,9 +891,9 @@ export default {
handleEditScheduled(row) {
this.editForm = { ...this.getEmptyEditForm(), ...row }
// 确保 actionType 为数字类型以匹配下拉选项
if (this.editForm.actionType != null && typeof this.editForm.actionType !== 'number') {
this.editForm.actionType = Number(this.editForm.actionType)
// 确保 actionId 为数字类型以匹配下拉选项
if (this.editForm.actionId != null && typeof this.editForm.actionId !== 'number') {
this.editForm.actionId = Number(this.editForm.actionId)
}
// 确保 scheduleStatus 为数字类型以匹配下拉选项
if (this.editForm.scheduleStatus != null && typeof this.editForm.scheduleStatus !== 'number') {
@@ -977,7 +977,7 @@ export default {
this.mergeForm = {
itemCount: this.mergeSourceRows.length,
scheduleNo: row.scheduleNo || '',
actionType: row.actionType != null ? Number(row.actionType) : '',
actionId: row.actionId != null ? Number(row.actionId) : '',
customerName: row.customerName || '',
spec: row.spec || '',
material: row.material || '',
@@ -1033,9 +1033,9 @@ export default {
return total.toFixed(3)
},
getActionTypeName(actionType) {
const p = this.processOptions.find(item => String(item.actionType) === String(actionType))
return p ? p.name : (actionType || '')
getActionIdName(actionId) {
const p = this.processOptions.find(item => String(item.actionId) === String(actionId))
return p ? p.name : (actionId || '')
},
handleDetailClick(sch, detail) {