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

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