【需求】生产管理 生产任务基础框架提交

pull/4/head
zengchenxi 8 months ago
parent d5be503399
commit b104320c27

@ -17,6 +17,9 @@ import com.chanko.yunxi.mes.framework.common.exception.ErrorCode;
* 004
* 005
* 006
* 007
* 008
* 009
* 3
*/
public interface ErrorCodeConstants {
@ -67,4 +70,6 @@ public interface ErrorCodeConstants {
ErrorCode MATERIAL_PLAN_DETAIL_NOT_EXISTS = new ErrorCode(1_008_002, "物料需求计划物料详情不存在");
ErrorCode PURCHASE_ORDER_NOT_EXISTS = new ErrorCode(1_008_003, "采购订单不存在");
ErrorCode PURCHASE_ORDER_MATERIAL_NOT_EXISTS = new ErrorCode(1_008_004, "采购单物料不存在");
/************生产管理***********/
ErrorCode TASK_DISPATCH_NOT_EXISTS = new ErrorCode(1_009_001, "派工单不存在");
}

@ -0,0 +1,106 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
import java.util.*;
import java.io.IOException;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import static com.chanko.yunxi.mes.framework.common.pojo.CommonResult.success;
import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
import static com.chanko.yunxi.mes.framework.operatelog.core.enums.OperateTypeEnum.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetail.TaskDispatchDetailDO;
import com.chanko.yunxi.mes.module.heli.service.taskdispatch.TaskDispatchService;
@Tag(name = "管理后台 - 派工单")
@RestController
@RequestMapping("/heli/task-dispatch")
@Validated
public class TaskDispatchController {
@Resource
private TaskDispatchService taskDispatchService;
@PostMapping("/create")
@Operation(summary = "创建派工单")
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:create')")
public CommonResult<Long> createTaskDispatch(@Valid @RequestBody TaskDispatchSaveReqVO createReqVO) {
return success(taskDispatchService.createTaskDispatch(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新派工单")
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:update')")
public CommonResult<Boolean> updateTaskDispatch(@Valid @RequestBody TaskDispatchSaveReqVO updateReqVO) {
taskDispatchService.updateTaskDispatch(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除派工单")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:delete')")
public CommonResult<Boolean> deleteTaskDispatch(@RequestParam("id") Long id) {
taskDispatchService.deleteTaskDispatch(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得派工单")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
public CommonResult<TaskDispatchRespVO> getTaskDispatch(@RequestParam("id") Long id) {
TaskDispatchDO taskDispatch = taskDispatchService.getTaskDispatch(id);
return success(BeanUtils.toBean(taskDispatch, TaskDispatchRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得派工单分页")
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
public CommonResult<PageResult<TaskDispatchRespVO>> getTaskDispatchPage(@Valid TaskDispatchPageReqVO pageReqVO) {
PageResult<TaskDispatchDO> pageResult = taskDispatchService.getTaskDispatchPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, TaskDispatchRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出派工单 Excel")
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:export')")
@OperateLog(type = EXPORT)
public void exportTaskDispatchExcel(@Valid TaskDispatchPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<TaskDispatchDO> list = taskDispatchService.getTaskDispatchPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "派工单.xls", "数据", TaskDispatchRespVO.class,
BeanUtils.toBean(list, TaskDispatchRespVO.class));
}
// ==================== 子表(派工明细) ====================
@GetMapping("/task-dispatch-detail/list-by-dispatch-id")
@Operation(summary = "获得派工明细列表")
@Parameter(name = "dispatchId", description = "派工单id")
@PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
public CommonResult<List<TaskDispatchDetailDO>> getTaskDispatchDetailListByDispatchId(@RequestParam("dispatchId") Long dispatchId) {
return success(taskDispatchService.getTaskDispatchDetailListByDispatchId(dispatchId));
}
}

@ -0,0 +1,52 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 派工单分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class TaskDispatchPageReqVO extends PageParam {
@Schema(description = "编号,唯一")
private String code;
@Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE", example = "1")
private String dispatchType;
@Schema(description = "生产任务id", example = "8538")
private Long taskId;
@Schema(description = "生产计划id", example = "3259")
private Long planId;
@Schema(description = "项目id", example = "19610")
private Long projectId;
@Schema(description = "子项目id", example = "21985")
private Long projectSubId;
@Schema(description = "bom明细id", example = "15969")
private Long bomDetailId;
@Schema(description = "派工状态 已保存|已提交|已终止 1|2|3", example = "2")
private Integer dispatchStatus;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "状态,1表示正常2表示禁用", example = "1")
private Integer status;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

@ -0,0 +1,68 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat;
import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert;
@Schema(description = "管理后台 - 派工单 Response VO")
@Data
@ExcelIgnoreUnannotated
public class TaskDispatchRespVO {
@Schema(description = "自增字段,唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "26723")
@ExcelProperty("自增字段,唯一")
private Long id;
@Schema(description = "编号,唯一")
@ExcelProperty("编号,唯一")
private String code;
@Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty(value = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE", converter = DictConvert.class)
@DictFormat("heli_dispatch_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
private String dispatchType;
@Schema(description = "生产任务id", example = "8538")
@ExcelProperty("生产任务id")
private Long taskId;
@Schema(description = "生产计划id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3259")
@ExcelProperty("生产计划id")
private Long planId;
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610")
@ExcelProperty("项目id")
private Long projectId;
@Schema(description = "子项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21985")
@ExcelProperty("子项目id")
private Long projectSubId;
@Schema(description = "bom明细id", example = "15969")
@ExcelProperty("bom明细id")
private Long bomDetailId;
@Schema(description = "派工状态 已保存|已提交|已终止 1|2|3", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty(value = "派工状态 已保存|已提交|已终止 1|2|3", converter = DictConvert.class)
@DictFormat("heli_dispatch_status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
private Integer dispatchStatus;
@Schema(description = "备注", example = "你说的对")
@ExcelProperty("备注")
private String remark;
@Schema(description = "状态,1表示正常2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("状态,1表示正常2表示禁用")
private Integer status;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

@ -0,0 +1,56 @@
package com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import javax.validation.constraints.*;
import java.util.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetail.TaskDispatchDetailDO;
@Schema(description = "管理后台 - 派工单新增/修改 Request VO")
@Data
public class TaskDispatchSaveReqVO {
@Schema(description = "自增字段,唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "26723")
private Long id;
@Schema(description = "编号,唯一")
private String code;
@Schema(description = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotEmpty(message = "派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE不能为空")
private String dispatchType;
@Schema(description = "生产任务id", example = "8538")
private Long taskId;
@Schema(description = "生产计划id", requiredMode = Schema.RequiredMode.REQUIRED, example = "3259")
@NotNull(message = "生产计划id不能为空")
private Long planId;
@Schema(description = "项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19610")
@NotNull(message = "项目id不能为空")
private Long projectId;
@Schema(description = "子项目id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21985")
@NotNull(message = "子项目id不能为空")
private Long projectSubId;
@Schema(description = "bom明细id", example = "15969")
private Long bomDetailId;
@Schema(description = "派工状态 已保存|已提交|已终止 1|2|3", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotNull(message = "派工状态 已保存|已提交|已终止 1|2|3不能为空")
private Integer dispatchStatus;
@Schema(description = "备注", example = "你说的对")
private String remark;
@Schema(description = "状态,1表示正常2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "状态,1表示正常2表示禁用不能为空")
private Integer status;
@Schema(description = "派工明细列表")
private List<TaskDispatchDetailDO> taskDispatchDetails;
}

@ -0,0 +1,75 @@
package com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
/**
* DO
*
* @author
*/
@TableName("pro_task_dispatch")
@KeySequence("pro_task_dispatch_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TaskDispatchDO extends BaseDO {
/**
*
*/
@TableId
private Long id;
/**
*
*/
private String code;
/**
* | PRODUCTION|ASSEMBLE
*
* {@link TODO heli_dispatch_type }
*/
private String dispatchType;
/**
* id
*/
private Long taskId;
/**
* id
*/
private Long planId;
/**
* id
*/
private Long projectId;
/**
* id
*/
private Long projectSubId;
/**
* bomid
*/
private Long bomDetailId;
/**
* || 1|2|3
*
* {@link TODO heli_dispatch_status }
*/
private Integer dispatchStatus;
/**
*
*/
private String remark;
/**
* ,12
*/
private Integer status;
}

@ -0,0 +1,64 @@
package com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetail;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO;
/**
* DO
*
* @author
*/
@TableName("pro_task_dispatch_detail")
@KeySequence("pro_task_dispatch_detail_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TaskDispatchDetailDO extends BaseDO {
/**
*
*/
@TableId
private Long id;
/**
* id
*/
private Long procedureId;
/**
*
*/
private Integer sort;
/**
*
*/
private Long owner;
/**
*
*/
private BigDecimal workTime;
/**
*
*/
private Integer amount;
/**
*
*/
private String summary;
/**
* ,12
*/
private Boolean status;
/**
* id
*/
private Long dispatchId;
}

@ -0,0 +1,28 @@
package com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatchdetail;
import java.util.*;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetail.TaskDispatchDetailDO;
import org.apache.ibatis.annotations.Mapper;
/**
* Mapper
*
* @author
*/
@Mapper
public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetailDO> {
default List<TaskDispatchDetailDO> selectListByDispatchId(Long dispatchId) {
return selectList(TaskDispatchDetailDO::getDispatchId, dispatchId);
}
default int deleteByDispatchId(Long dispatchId) {
return delete(TaskDispatchDetailDO::getDispatchId, dispatchId);
}
}

@ -0,0 +1,36 @@
package com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch;
import java.util.*;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
import org.apache.ibatis.annotations.Mapper;
import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
/**
* Mapper
*
* @author
*/
@Mapper
public interface TaskDispatchMapper extends BaseMapperX<TaskDispatchDO> {
default PageResult<TaskDispatchDO> selectPage(TaskDispatchPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<TaskDispatchDO>()
.eqIfPresent(TaskDispatchDO::getCode, reqVO.getCode())
.eqIfPresent(TaskDispatchDO::getDispatchType, reqVO.getDispatchType())
.eqIfPresent(TaskDispatchDO::getTaskId, reqVO.getTaskId())
.eqIfPresent(TaskDispatchDO::getPlanId, reqVO.getPlanId())
.eqIfPresent(TaskDispatchDO::getProjectId, reqVO.getProjectId())
.eqIfPresent(TaskDispatchDO::getProjectSubId, reqVO.getProjectSubId())
.eqIfPresent(TaskDispatchDO::getBomDetailId, reqVO.getBomDetailId())
.eqIfPresent(TaskDispatchDO::getDispatchStatus, reqVO.getDispatchStatus())
.eqIfPresent(TaskDispatchDO::getRemark, reqVO.getRemark())
.eqIfPresent(TaskDispatchDO::getStatus, reqVO.getStatus())
.betweenIfPresent(TaskDispatchDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TaskDispatchDO::getId));
}
}

@ -0,0 +1,66 @@
package com.chanko.yunxi.mes.module.heli.service.taskdispatch;
import java.util.*;
import javax.validation.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetail.TaskDispatchDetailDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
/**
* Service
*
* @author
*/
public interface TaskDispatchService {
/**
*
*
* @param createReqVO
* @return
*/
Long createTaskDispatch(@Valid TaskDispatchSaveReqVO createReqVO);
/**
*
*
* @param updateReqVO
*/
void updateTaskDispatch(@Valid TaskDispatchSaveReqVO updateReqVO);
/**
*
*
* @param id
*/
void deleteTaskDispatch(Long id);
/**
*
*
* @param id
* @return
*/
TaskDispatchDO getTaskDispatch(Long id);
/**
*
*
* @param pageReqVO
* @return
*/
PageResult<TaskDispatchDO> getTaskDispatchPage(TaskDispatchPageReqVO pageReqVO);
// ==================== 子表(派工明细) ====================
/**
*
*
* @param dispatchId id
* @return
*/
List<TaskDispatchDetailDO> getTaskDispatchDetailListByDispatchId(Long dispatchId);
}

@ -0,0 +1,112 @@
package com.chanko.yunxi.mes.module.heli.service.taskdispatch;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import com.chanko.yunxi.mes.module.heli.controller.admin.taskdispatch.vo.*;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatchdetail.TaskDispatchDetailDO;
import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper;
import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatchdetail.TaskDispatchDetailMapper;
import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
/**
* Service
*
* @author
*/
@Service
@Validated
public class TaskDispatchServiceImpl implements TaskDispatchService {
@Resource
private TaskDispatchMapper taskDispatchMapper;
@Resource
private TaskDispatchDetailMapper taskDispatchDetailMapper;
@Override
@Transactional(rollbackFor = Exception.class)
public Long createTaskDispatch(TaskDispatchSaveReqVO createReqVO) {
// 插入
TaskDispatchDO taskDispatch = BeanUtils.toBean(createReqVO, TaskDispatchDO.class);
taskDispatchMapper.insert(taskDispatch);
// 插入子表
createTaskDispatchDetailList(taskDispatch.getId(), createReqVO.getTaskDispatchDetails());
// 返回
return taskDispatch.getId();
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskDispatch(TaskDispatchSaveReqVO updateReqVO) {
// 校验存在
validateTaskDispatchExists(updateReqVO.getId());
// 更新
TaskDispatchDO updateObj = BeanUtils.toBean(updateReqVO, TaskDispatchDO.class);
taskDispatchMapper.updateById(updateObj);
// 更新子表
updateTaskDispatchDetailList(updateReqVO.getId(), updateReqVO.getTaskDispatchDetails());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteTaskDispatch(Long id) {
// 校验存在
validateTaskDispatchExists(id);
// 删除
taskDispatchMapper.deleteById(id);
// 删除子表
deleteTaskDispatchDetailByDispatchId(id);
}
private void validateTaskDispatchExists(Long id) {
if (taskDispatchMapper.selectById(id) == null) {
throw exception(TASK_DISPATCH_NOT_EXISTS);
}
}
@Override
public TaskDispatchDO getTaskDispatch(Long id) {
return taskDispatchMapper.selectById(id);
}
@Override
public PageResult<TaskDispatchDO> getTaskDispatchPage(TaskDispatchPageReqVO pageReqVO) {
return taskDispatchMapper.selectPage(pageReqVO);
}
// ==================== 子表(派工明细) ====================
@Override
public List<TaskDispatchDetailDO> getTaskDispatchDetailListByDispatchId(Long dispatchId) {
return taskDispatchDetailMapper.selectListByDispatchId(dispatchId);
}
private void createTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailDO> list) {
list.forEach(o -> o.setDispatchId(dispatchId));
taskDispatchDetailMapper.insertBatch(list);
}
private void updateTaskDispatchDetailList(Long dispatchId, List<TaskDispatchDetailDO> list) {
deleteTaskDispatchDetailByDispatchId(dispatchId);
list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下1id 冲突2updateTime 不更新
createTaskDispatchDetailList(dispatchId, list);
}
private void deleteTaskDispatchDetailByDispatchId(Long dispatchId) {
taskDispatchDetailMapper.deleteByDispatchId(dispatchId);
}
}

@ -0,0 +1,12 @@
<?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.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper">
<!--
一般情况下,尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景,例如说多表关联查询,才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身,更多推荐 MybatisX 快速开发插件来生成查询。
文档可见https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

@ -0,0 +1,52 @@
import request from '@/config/axios'
export interface TaskDispatchVO {
id: number
code: string
dispatchType: string
taskId: number
planId: number
projectId: number
projectSubId: number
bomDetailId: number
dispatchStatus: number
remark: string
status: number
}
// 查询派工单分页
export const getTaskDispatchPage = async (params) => {
return await request.get({ url: `/heli/task-dispatch/page`, params })
}
// 查询派工单详情
export const getTaskDispatch = async (id: number) => {
return await request.get({ url: `/heli/task-dispatch/get?id=` + id })
}
// 新增派工单
export const createTaskDispatch = async (data: TaskDispatchVO) => {
return await request.post({ url: `/heli/task-dispatch/create`, data })
}
// 修改派工单
export const updateTaskDispatch = async (data: TaskDispatchVO) => {
return await request.put({ url: `/heli/task-dispatch/update`, data })
}
// 删除派工单
export const deleteTaskDispatch = async (id: number) => {
return await request.delete({ url: `/heli/task-dispatch/delete?id=` + id })
}
// 导出派工单 Excel
export const exportTaskDispatch = async (params) => {
return await request.download({ url: `/heli/task-dispatch/export-excel`, params })
}
// ==================== 子表(派工明细) ====================
// 获得派工明细列表
export const getTaskDispatchDetailListByDispatchId = async (dispatchId) => {
return await request.get({ url: `/heli/task-dispatch/task-dispatch-detail/list-by-dispatch-id?dispatchId=` + dispatchId })
}

@ -0,0 +1,176 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="编号,唯一" prop="code">
<el-input v-model="formData.code" placeholder="请输入编号,唯一" />
</el-form-item>
<el-form-item label="派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE" prop="dispatchType">
<el-select v-model="formData.dispatchType" placeholder="请选择派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DISPATCH_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产任务id" prop="taskId">
<el-input v-model="formData.taskId" placeholder="请输入生产任务id" />
</el-form-item>
<el-form-item label="生产计划id" prop="planId">
<el-input v-model="formData.planId" placeholder="请输入生产计划id" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="formData.projectId" placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="子项目id" prop="projectSubId">
<el-input v-model="formData.projectSubId" placeholder="请输入子项目id" />
</el-form-item>
<el-form-item label="bom明细id" prop="bomDetailId">
<el-input v-model="formData.bomDetailId" placeholder="请输入bom明细id" />
</el-form-item>
<el-form-item label="派工状态 已保存|已提交|已终止 1|2|3" prop="dispatchStatus">
<el-select v-model="formData.dispatchStatus" placeholder="请选择派工状态 已保存|已提交|已终止 1|2|3">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DISPATCH_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="状态,1表示正常2表示禁用" prop="status">
<el-radio-group v-model="formData.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<!-- 子表的表单 -->
<el-tabs v-model="subTabsName">
<el-tab-pane label="派工明细" name="taskDispatchDetail">
<TaskDispatchDetailForm ref="taskDispatchDetailFormRef" :dispatch-id="formData.id" />
</el-tab-pane>
</el-tabs>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import * as TaskDispatchApi from '@/api/heli/taskdispatch'
import TaskDispatchDetailForm from './components/TaskDispatchDetailForm.vue'
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
code: undefined,
dispatchType: undefined,
taskId: undefined,
planId: undefined,
projectId: undefined,
projectSubId: undefined,
bomDetailId: undefined,
dispatchStatus: undefined,
remark: undefined,
status: undefined,
})
const formRules = reactive({
dispatchType: [{ required: true, message: '派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE不能为空', trigger: 'change' }],
planId: [{ required: true, message: '生产计划id不能为空', trigger: 'blur' }],
projectId: [{ required: true, message: '项目id不能为空', trigger: 'blur' }],
projectSubId: [{ required: true, message: '子项目id不能为空', trigger: 'blur' }],
dispatchStatus: [{ required: true, message: '派工状态 已保存|已提交|已终止 1|2|3不能为空', trigger: 'change' }],
status: [{ required: true, message: '状态,1表示正常2表示禁用不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 子表的表单 */
const subTabsName = ref('taskDispatchDetail')
const taskDispatchDetailFormRef = ref()
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await TaskDispatchApi.getTaskDispatch(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
try {
await taskDispatchDetailFormRef.value.validate()
} catch (e) {
subTabsName.value = 'taskDispatchDetail'
return
}
//
formLoading.value = true
try {
const data = formData.value as unknown as TaskDispatchApi.TaskDispatchVO
//
data.taskDispatchDetails = taskDispatchDetailFormRef.value.getData()
if (formType.value === 'create') {
await TaskDispatchApi.createTaskDispatch(data)
message.success(t('common.createSuccess'))
} else {
await TaskDispatchApi.updateTaskDispatch(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
dispatchType: undefined,
taskId: undefined,
planId: undefined,
projectId: undefined,
projectSubId: undefined,
bomDetailId: undefined,
dispatchStatus: undefined,
remark: undefined,
status: undefined,
}
formRef.value?.resetFields()
}
</script>

@ -0,0 +1,151 @@
<template>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
v-loading="formLoading"
label-width="0px"
:inline-message="true"
>
<el-table :data="formData" class="-mt-10px">
<el-table-column label="序号" type="index" width="100" />
<el-table-column label="工序id" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.procedureId`" :rules="formRules.procedureId" class="mb-0px!">
<el-input v-model="row.procedureId" placeholder="请输入工序id" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="顺序号" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.sort`" :rules="formRules.sort" class="mb-0px!">
<el-input v-model="row.sort" placeholder="请输入顺序号" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="负责人" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.owner`" :rules="formRules.owner" class="mb-0px!">
<el-input v-model="row.owner" placeholder="请输入负责人" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="预计工时" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.workTime`" :rules="formRules.workTime" class="mb-0px!">
<el-date-picker
v-model="row.workTime"
type="date"
value-format="x"
placeholder="选择预计工时"
/>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="派工数量" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.amount`" :rules="formRules.amount" class="mb-0px!">
<el-input v-model="row.amount" placeholder="请输入派工数量" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="工序要点" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.summary`" :rules="formRules.summary" class="mb-0px!">
<el-input v-model="row.summary" placeholder="请输入工序要点" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="状态,1表示正常2表示禁用" min-width="150">
<template #default="{ row, $index }">
<el-form-item :prop="`${$index}.status`" :rules="formRules.status" class="mb-0px!">
<el-radio-group v-model="row.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
</template>
</el-table-column>
<el-table-column align="center" fixed="right" label="操作" width="60">
<template #default="{ $index }">
<el-button @click="handleDelete($index)" link></el-button>
</template>
</el-table-column>
</el-table>
</el-form>
<el-row justify="center" class="mt-3">
<el-button @click="handleAdd" round>+ 添加派工明细</el-button>
</el-row>
</template>
<script setup lang="ts">
import * as TaskDispatchApi from '@/api/heli/taskdispatch'
const props = defineProps<{
dispatchId: undefined // id
}>()
const formLoading = ref(false) //
const formData = ref([])
const formRules = reactive({
procedureId: [{ required: true, message: '工序id不能为空', trigger: 'blur' }],
sort: [{ required: true, message: '顺序号不能为空', trigger: 'blur' }],
owner: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
workTime: [{ required: true, message: '预计工时不能为空', trigger: 'blur' }],
amount: [{ required: true, message: '派工数量不能为空', trigger: 'blur' }],
status: [{ required: true, message: '状态,1表示正常2表示禁用不能为空', trigger: 'blur' }],
dispatchId: [{ required: true, message: '派工单id不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 监听主表的关联字段的变化,加载对应的子表数据 */
watch(
() => props.dispatchId,
async (val) => {
// 1.
formData.value = []
// 2. val
if (!val) {
return;
}
try {
formLoading.value = true
formData.value = await TaskDispatchApi.getTaskDispatchDetailListByDispatchId(val)
} finally {
formLoading.value = false
}
},
{ immediate: true }
)
/** 新增按钮操作 */
const handleAdd = () => {
const row = {
id: undefined,
procedureId: undefined,
sort: undefined,
owner: undefined,
workTime: undefined,
amount: undefined,
summary: undefined,
status: undefined,
dispatchId: undefined,
}
row.dispatchId = props.dispatchId
formData.value.push(row)
}
/** 删除按钮操作 */
const handleDelete = (index) => {
formData.value.splice(index, 1)
}
/** 表单校验 */
const validate = () => {
return formRef.value.validate()
}
/** 表单值 */
const getData = () => {
return formData.value
}
defineExpose({ validate, getData })
</script>

@ -0,0 +1,307 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="编号,唯一" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入编号,唯一"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE" prop="dispatchType">
<el-select
v-model="queryParams.dispatchType"
placeholder="请选择派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.HELI_DISPATCH_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="生产任务id" prop="taskId">
<el-input
v-model="queryParams.taskId"
placeholder="请输入生产任务id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="生产计划id" prop="planId">
<el-input
v-model="queryParams.planId"
placeholder="请输入生产计划id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input
v-model="queryParams.projectId"
placeholder="请输入项目id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="子项目id" prop="projectSubId">
<el-input
v-model="queryParams.projectSubId"
placeholder="请输入子项目id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="bom明细id" prop="bomDetailId">
<el-input
v-model="queryParams.bomDetailId"
placeholder="请输入bom明细id"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="派工状态 已保存|已提交|已终止 1|2|3" prop="dispatchStatus">
<el-select
v-model="queryParams.dispatchStatus"
placeholder="请选择派工状态 已保存|已提交|已终止 1|2|3"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DISPATCH_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态,1表示正常2表示禁用" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态,1表示正常2表示禁用"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['heli:task-dispatch:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['heli:task-dispatch:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="自增字段,唯一" align="center" prop="id" />
<el-table-column label="编号,唯一" align="center" prop="code" />
<el-table-column label="派工类型 生产任务|装配任务 PRODUCTION|ASSEMBLE" align="center" prop="dispatchType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_DISPATCH_TYPE" :value="scope.row.dispatchType" />
</template>
</el-table-column>
<el-table-column label="生产任务id" align="center" prop="taskId" />
<el-table-column label="生产计划id" align="center" prop="planId" />
<el-table-column label="项目id" align="center" prop="projectId" />
<el-table-column label="子项目id" align="center" prop="projectSubId" />
<el-table-column label="bom明细id" align="center" prop="bomDetailId" />
<el-table-column label="派工状态 已保存|已提交|已终止 1|2|3" align="center" prop="dispatchStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_DISPATCH_STATUS" :value="scope.row.dispatchStatus" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="状态,1表示正常2表示禁用" align="center" prop="status" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['heli:task-dispatch:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['heli:task-dispatch:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<TaskDispatchForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import * as TaskDispatchApi from '@/api/heli/taskdispatch'
import TaskDispatchForm from './TaskDispatchForm.vue'
defineOptions({ name: 'TaskDispatch' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
dispatchType: undefined,
taskId: undefined,
planId: undefined,
projectId: undefined,
projectSubId: undefined,
bomDetailId: undefined,
dispatchStatus: undefined,
remark: undefined,
status: undefined,
createTime: [],
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await TaskDispatchApi.getTaskDispatchPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await TaskDispatchApi.deleteTaskDispatch(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await TaskDispatchApi.exportTaskDispatch(queryParams)
download.excel(data, '派工单.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

@ -38,6 +38,7 @@ CREATE TABLE `pro_task_dispatch` (
DROP TABLE IF EXISTS `pro_task_dispatch_detail`;
CREATE TABLE `pro_task_dispatch_detail` (
`id` BIGINT ( 20 ) NOT NULL AUTO_INCREMENT COMMENT '自增字段,唯一',
`dispatch_id` bigint(20) not null comment '派工单id',
`procedure_id` BIGINT ( 20 ) NOT NULL COMMENT '工序id',
`sort` INT ( 11 ) NOT NULL COMMENT '顺序号',
`owner` BIGINT ( 20 ) NOT NULL COMMENT '负责人',

Loading…
Cancel
Save