diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/api/ProcessRouteTaskApi.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/api/ProcessRouteTaskApi.java new file mode 100644 index 00000000..70e1d4c7 --- /dev/null +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/api/ProcessRouteTaskApi.java @@ -0,0 +1,20 @@ +package com.nflg.product.technology.api; + + +import com.nflg.product.base.core.api.BaseApi; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *
+ * 工艺路线-任务清单(抬头) 前端控制器 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +@RestController +@RequestMapping("/processRouteTask") +public class ProcessRouteTaskApi extends BaseApi { + +} diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskAssemblyMapper.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskAssemblyMapper.java new file mode 100644 index 00000000..f8add6f6 --- /dev/null +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/mapper/master/ProcessRouteTaskAssemblyMapper.java @@ -0,0 +1,16 @@ +package com.nflg.product.technology.mapper.master; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.nflg.product.technology.pojo.entity.ProcessRouteTaskAssemblyEntity; + +/** + *+ * 工艺路线-组件分配 Mapper 接口 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +public interface ProcessRouteTaskAssemblyMapper extends BaseMapper+ * 工艺路线-任务清单(抬头) Mapper 接口 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +public interface ProcessRouteTaskMapper extends BaseMapper+ * 工艺路线-工序 Mapper 接口 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +public interface ProcessRouteTaskProcessesMapper extends BaseMapper+ * 工艺路线-组件分配 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +@Data +@Accessors(chain = true) +@TableName("t_process_route_task_assembly") +public class ProcessRouteTaskAssemblyEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + private Long rowId; + + // 任务清单ID + @TableField(value = "task_row_id") + private Long taskRowId; + + // 虚拟装配:0=false、1=true + @TableField(value = "virtual_assembly") + private Integer virtualAssembly; + + // PBOM父行ID + @TableField(value = "source_row_id") + private Long sourceRowId; + + // 层 + @TableField(value = "level") + private Integer level; + + // 项目编号 + @TableField(value = "project_code") + private String projectCode; + + // 组件 + @TableField(value = "material_no") + private String materialNo; + + // 数量 + @TableField(value = "num") + private BigDecimal num; + + // 排序字符串 + @TableField(value = "sap_order_num") + private String sapOrderNum; + + // 计量单位 + @TableField(value = "material_unit") + private String materialUnit; + + // 项目类别 + @TableField(value = "project_type") + private String projectType; + + // 是否反冲:0=false、1=true + @TableField(value = "recoil") + private Integer recoil; + + // 操作/活动 + @TableField(value = "processe") + private String processe; + + // BOM表头物料 + @TableField(value = "parent_material_no") + private String parentMaterialNo; + + // 有效起始日 + @TableField(value = "expire_start_time") + private LocalDateTime expireStartTime; + + // 有效至 + @TableField(value = "expire_end_time") + private LocalDateTime expireEndTime; + + // 删除标记:0=未删除、1=已删除 + @TableField(value = "del_flag") + private Integer delFlag; + + // 创建人 + @TableField(value = "created_by") + private String createdBy; + + // 创建时间 + @TableField(value = "created_time") + private LocalDateTime createdTime; + + // 更新人 + @TableField(value = "updated_by") + private String updatedBy; + + // 更新时间 + @TableField(value = "updated_time") + private LocalDateTime updatedTime; + + +} diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java new file mode 100644 index 00000000..36cfc184 --- /dev/null +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskEntity.java @@ -0,0 +1,100 @@ +package com.nflg.product.technology.pojo.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *+ * 工艺路线-任务清单(抬头) + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +@Data +@Accessors(chain = true) +@TableName("t_process_route_task") +public class ProcessRouteTaskEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + private Long rowId; + + // 工艺路线编号 + @TableField(value = "task_code") + private String taskCode; + + // 工厂编码 + @TableField(value = "factory") + private String factory; + + // 物料编码 + @TableField(value = "material_no") + private String materialNo; + + // 任务清单描述 + @TableField(value = "description") + private String description; + + // 用途:1=生产 2=工程/设计 3=万能 4=工厂维护 5=货物接收 51=货物接收模型 53=GR外部处理 6= 货物发放 9=物料检验 + @TableField(value = "usefulness") + private Integer usefulness; + + // 状态:1=生成的、2=对订单下达、3=对成本核算下达 + @TableField(value = "status") + private Integer status; + + // 从批量 + @TableField(value = "from_batch") + private String fromBatch; + + // 到批量 + @TableField(value = "to_batch") + private String toBatch; + + // 有效起始日 + @TableField(value = "expire_start_time") + private LocalDateTime expireStartTime; + + // 有效至 + @TableField(value = "expire_end_time") + private LocalDateTime expireEndTime; + + // 删除标记:0=未删除、1=已删除 + @TableField(value = "del_flag") + private Integer delFlag; + + // 创建人 + @TableField(value = "created_by") + private String createdBy; + + // 创建时间 + @TableField(value = "created_time") + private LocalDateTime createdTime; + + // 更新人 + @TableField(value = "updated_by") + private String updatedBy; + + // 更新时间 + @TableField(value = "updated_time") + private LocalDateTime updatedTime; + + // 处理状态:1=修改中、2=暂存中、3=已完成 + @TableField(value = "handle_state") + private Integer handleState; + + // SAP导入状态:1=已导入、2=未导入、3=异常、4=已修改(未导入) + @TableField(value = "sap_state") + private Integer sapState; + + +} diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java new file mode 100644 index 00000000..fbdfbb46 --- /dev/null +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/pojo/entity/ProcessRouteTaskProcessesEntity.java @@ -0,0 +1,149 @@ +package com.nflg.product.technology.pojo.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + *+ * 工艺路线-工序 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +@Data +@Accessors(chain = true) +@TableName("t_process_route_task_processes") +public class ProcessRouteTaskProcessesEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "row_id", type = IdType.ASSIGN_ID) + private Long rowId; + + // 任务清单ID + @TableField(value = "task_row_id") + private Long taskRowId; + + // 工序 + @TableField(value = "processe") + private String processe; + + // 工作中心 + @TableField(value = "work_center") + private String workCenter; + + // 工厂编码 + @TableField(value = "factory") + private String factory; + + // 控制码 + @TableField(value = "control_code") + private String controlCode; + + // 基本数量 + @TableField(value = "base_num") + private Integer baseNum; + + // 工序的计量单位(默认为PC,不可以编辑) + @TableField(value = "material_unit") + private String materialUnit; + + // 有效起始日 + @TableField(value = "expire_start_time") + private LocalDateTime expireStartTime; + + // 有效至 + @TableField(value = "expire_end_time") + private LocalDateTime expireEndTime; + + // 活动类型 + @TableField(value = "two_activity_type") + private String twoActivityType; + + // 单位 + @TableField(value = "two_job_unit") + private String twoJobUnit; + + // 机器(填写工时) + @TableField(value = "two_work_hours") + private BigDecimal twoWorkHours; + + // 活动类型 + @TableField(value = "one_activity_type") + private String oneActivityType; + + // 单位 + @TableField(value = "one_job_unit") + private String oneJobUnit; + + // 人工(填写工时) + @TableField(value = "one_work_hours") + private BigDecimal oneWorkHours; + + // 活动类型 + @TableField(value = "three_activity_type") + private String threeActivityType; + + // 单位 + @TableField(value = "three_job_unit") + private String threeJobUnit; + + // 固定(填写工时) + @TableField(value = "three_work_hours") + private BigDecimal threeWorkHours; + + // 活动类型 + @TableField(value = "four_activity_type") + private String fourActivityType; + + // 单位 + @TableField(value = "four_job_unit") + private String fourJobUnit; + + // 可变(填写工时) + @TableField(value = "four_work_hours") + private BigDecimal fourWorkHours; + + // 活动类型 + @TableField(value = "non_activity_type") + private String nonActivityType; + + // 单位 + @TableField(value = "non_job_unit") + private String nonJobUnit; + + // 排产(填写工时) + @TableField(value = "non_work_hours") + private BigDecimal nonWorkHours; + + // 删除标记:0=未删除、1=已删除 + @TableField(value = "del_flag") + private Integer delFlag; + + // 创建人 + @TableField(value = "created_by") + private String createdBy; + + // 创建时间 + @TableField(value = "created_time") + private LocalDateTime createdTime; + + // 更新人 + @TableField(value = "updated_by") + private String updatedBy; + + // 更新时间 + @TableField(value = "updated_time") + private LocalDateTime updatedTime; + + +} diff --git a/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskAssemblyService.java b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskAssemblyService.java new file mode 100644 index 00000000..9c89d45f --- /dev/null +++ b/nflg_project_dev/nflg-technology/src/main/java/com/nflg/product/technology/service/ProcessRouteTaskAssemblyService.java @@ -0,0 +1,19 @@ +package com.nflg.product.technology.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.product.technology.mapper.master.ProcessRouteTaskAssemblyMapper; +import com.nflg.product.technology.pojo.entity.ProcessRouteTaskAssemblyEntity; +import org.springframework.stereotype.Service; + +/** + *+ * 工艺路线-组件分配 服务类 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +@Service +public class ProcessRouteTaskAssemblyService extends ServiceImpl+ * 工艺路线-工序 服务类 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +@Service +public class ProcessRouteTaskProcessesService extends ServiceImpl+ * 工艺路线-任务清单(抬头) 服务类 + *
+ * + * @author 10001392 + * @since 2024-11-24 + */ +@Service +public class ProcessRouteTaskService extends ServiceImpl