From b30a906ef1f76b2a6d9c3cc657d51a734152502e Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Tue, 9 Jan 2024 14:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84-?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E3=80=91=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/heli/enums/ErrorCodeConstants.java | 1 + .../admin/classes/ClassesController.java | 95 ++++++++ .../admin/classes/vo/ClassesPageReqVO.java | 43 ++++ .../admin/classes/vo/ClassesRespVO.java | 60 +++++ .../admin/classes/vo/ClassesSaveReqVO.java | 41 ++++ .../dal/dataobject/classes/ClassesDO.java | 70 ++++++ .../heli/dal/mysql/classes/ClassesMapper.java | 34 +++ .../heli/service/classes/ClassesService.java | 55 +++++ .../service/classes/ClassesServiceImpl.java | 79 +++++++ .../mapper/classes/ClassesMapper.xml | 12 + .../src/api/heli/classes/index.ts | 42 ++++ .../src/views/heli/classes/ClassesForm.vue | 214 ++++++++++++++++++ .../src/views/heli/classes/index.vue | 214 ++++++++++++++++++ .../src/views/heli/dept/DeptForm.vue | 1 + .../src/views/heli/workshop/WorkshopForm.vue | 1 + sql/mes-heli.sql | 2 +- 16 files changed, 963 insertions(+), 1 deletion(-) create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/ClassesController.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesPageReqVO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesRespVO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesSaveReqVO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/classes/ClassesDO.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/classes/ClassesMapper.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesService.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesServiceImpl.java create mode 100644 mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/classes/ClassesMapper.xml create mode 100644 mes-ui/mes-ui-admin-vue3/src/api/heli/classes/index.ts create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/classes/index.vue diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java index a5980b73..81ac8c29 100644 --- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java +++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java @@ -22,5 +22,6 @@ public interface ErrorCodeConstants { /*********组织架构************/ ErrorCode WORKSHOP_NOT_EXISTS = new ErrorCode(1_002_001, "车间不存在"); + ErrorCode CLASSES_NOT_EXISTS = new ErrorCode(1_002_002, "生产班组不存在"); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/ClassesController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/ClassesController.java new file mode 100644 index 00000000..442b4b2e --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/ClassesController.java @@ -0,0 +1,95 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.classes; + +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.classes.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.classes.ClassesDO; +import com.chanko.yunxi.mes.module.heli.service.classes.ClassesService; + +@Tag(name = "管理后台 - 生产班组") +@RestController +@RequestMapping("/heli/classes") +@Validated +public class ClassesController { + + @Resource + private ClassesService classesService; + + @PostMapping("/create") + @Operation(summary = "创建生产班组") + @PreAuthorize("@ss.hasPermission('heli:classes:create')") + public CommonResult createClasses(@Valid @RequestBody ClassesSaveReqVO createReqVO) { + return success(classesService.createClasses(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新生产班组") + @PreAuthorize("@ss.hasPermission('heli:classes:update')") + public CommonResult updateClasses(@Valid @RequestBody ClassesSaveReqVO updateReqVO) { + classesService.updateClasses(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除生产班组") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('heli:classes:delete')") + public CommonResult deleteClasses(@RequestParam("id") Long id) { + classesService.deleteClasses(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得生产班组") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:classes:query')") + public CommonResult getClasses(@RequestParam("id") Long id) { + ClassesDO classes = classesService.getClasses(id); + return success(BeanUtils.toBean(classes, ClassesRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得生产班组分页") + @PreAuthorize("@ss.hasPermission('heli:classes:query')") + public CommonResult> getClassesPage(@Valid ClassesPageReqVO pageReqVO) { + PageResult pageResult = classesService.getClassesPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ClassesRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出生产班组 Excel") + @PreAuthorize("@ss.hasPermission('heli:classes:export')") + @OperateLog(type = EXPORT) + public void exportClassesExcel(@Valid ClassesPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = classesService.getClassesPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "生产班组.xls", "数据", ClassesRespVO.class, + BeanUtils.toBean(list, ClassesRespVO.class)); + } + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesPageReqVO.java new file mode 100644 index 00000000..87db388c --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesPageReqVO.java @@ -0,0 +1,43 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.classes.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 ClassesPageReqVO extends PageParam { + + @Schema(description = "班组编码，唯一") + private String code; + + @Schema(description = "班组名称，唯一", example = "芋艿") + private String name; + + @Schema(description = "所属车间", example = "13955") + private Long workshopId; + + @Schema(description = "部门id", example = "12251") + private Long deptId; + + @Schema(description = "负责人", example = "1539") + private Long leaderUserId; + + @Schema(description = "班组描述", example = "你猜") + private String description; + + @Schema(description = "状态,1表示正常，2表示禁用", example = "1") + private Integer status; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesRespVO.java new file mode 100644 index 00000000..51563478 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesRespVO.java @@ -0,0 +1,60 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.classes.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.*; + +@Schema(description = "管理后台 - 生产班组 Response VO") +@Data +@ExcelIgnoreUnannotated +public class ClassesRespVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "4116") + @ExcelProperty("自增字段，唯一") + private Long id; + + @Schema(description = "班组编码，唯一") + @ExcelProperty("班组编码，唯一") + private String code; + + @Schema(description = "班组名称，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("班组名称，唯一") + private String name; + + @Schema(description = "所属车间", requiredMode = Schema.RequiredMode.REQUIRED, example = "13955") + @ExcelProperty("所属车间") + private Long workshopId; + + @Schema(description = "所属车间名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "13955") + @ExcelProperty("所属车间名称") + private String workshopName; + + @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12251") + @ExcelProperty("部门id") + private Long deptId; + + @Schema(description = "负责人", example = "1539") + @ExcelProperty("负责人") + private Long leaderUserId; + + @Schema(description = "负责人名称", example = "1539") + @ExcelProperty("负责人名称") + private String leaderUserName; + + @Schema(description = "班组描述", example = "你猜") + @ExcelProperty("班组描述") + private String description; + + @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; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesSaveReqVO.java new file mode 100644 index 00000000..3c4dbab6 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/classes/vo/ClassesSaveReqVO.java @@ -0,0 +1,41 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.classes.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; + +@Schema(description = "管理后台 - 生产班组新增/修改 Request VO") +@Data +public class ClassesSaveReqVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "4116") + private Long id; + + @Schema(description = "班组编码，唯一") + private String code; + + @Schema(description = "班组名称，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @NotEmpty(message = "班组名称，唯一不能为空") + private String name; + + @Schema(description = "所属车间", requiredMode = Schema.RequiredMode.REQUIRED, example = "13955") + @NotNull(message = "所属车间不能为空") + private Long workshopId; + + @Schema(description = "部门id", requiredMode = Schema.RequiredMode.REQUIRED, example = "12251") + @NotNull(message = "部门id不能为空") + private Long deptId; + + @Schema(description = "负责人", example = "1539") + private Long leaderUserId; + + @Schema(description = "班组描述", example = "你猜") + private String description; + + @Schema(description = "状态,1表示正常，2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "状态,1表示正常，2表示禁用不能为空") + private Integer status; + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/classes/ClassesDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/classes/ClassesDO.java new file mode 100644 index 00000000..1314b6c0 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/classes/ClassesDO.java @@ -0,0 +1,70 @@ +package com.chanko.yunxi.mes.module.heli.dal.dataobject.classes; + +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("base_classes") +@KeySequence("base_classes_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ClassesDO extends BaseDO { + + /** + * 自增字段，唯一 + */ + @TableId + private Long id; + /** + * 班组编码，唯一 + */ + private String code; + /** + * 班组名称，唯一 + */ + private String name; + /** + * 所属车间 + */ + private Long workshopId; + /** + * 部门id + */ + private Long deptId; + /** + * 负责人 + */ + private Long leaderUserId; + /** + * 班组描述 + */ + private String description; + /** + * 状态,1表示正常，2表示禁用 + */ + private Integer status; + /** + * 车间名称 + */ + @TableField(exist = false) + private String workshopName; + /** + * 负责人名称 + */ + @TableField(exist = false) + private String leaderUserName; + + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/classes/ClassesMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/classes/ClassesMapper.java new file mode 100644 index 00000000..7440d760 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/classes/ClassesMapper.java @@ -0,0 +1,34 @@ +package com.chanko.yunxi.mes.module.heli.dal.mysql.classes; + +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; +import com.chanko.yunxi.mes.module.heli.controller.admin.classes.vo.ClassesPageReqVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.classes.ClassesDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.workshop.WorkshopDO; +import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import org.apache.commons.lang.StringUtils; +import org.apache.ibatis.annotations.Mapper; + +/** + * 生产班组 Mapper + * + * @author 管理员 + */ +@Mapper +public interface ClassesMapper extends BaseMapperX { + + default PageResult selectPage(ClassesPageReqVO reqVO) { + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(ClassesDO.class) + .select("u.nickname as leaderUserName", "w.name as workshopName") + .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, ClassesDO::getLeaderUserId) + .leftJoin(WorkshopDO.class, "w", WorkshopDO::getId, ClassesDO::getWorkshopId); + + query.like(!StringUtils.isEmpty(reqVO.getCode()), ClassesDO::getCode, reqVO.getCode()) + .like(!StringUtils.isEmpty(reqVO.getName()), ClassesDO::getName, reqVO.getName()) + .eq(reqVO.getStatus() != null, ClassesDO::getStatus, reqVO.getStatus()); + return selectPage(reqVO, query); + } + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesService.java new file mode 100644 index 00000000..b37f554a --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesService.java @@ -0,0 +1,55 @@ +package com.chanko.yunxi.mes.module.heli.service.classes; + +import java.util.*; +import javax.validation.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.classes.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.classes.ClassesDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 生产班组 Service 接口 + * + * @author 管理员 + */ +public interface ClassesService { + + /** + * 创建生产班组 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createClasses(@Valid ClassesSaveReqVO createReqVO); + + /** + * 更新生产班组 + * + * @param updateReqVO 更新信息 + */ + void updateClasses(@Valid ClassesSaveReqVO updateReqVO); + + /** + * 删除生产班组 + * + * @param id 编号 + */ + void deleteClasses(Long id); + + /** + * 获得生产班组 + * + * @param id 编号 + * @return 生产班组 + */ + ClassesDO getClasses(Long id); + + /** + * 获得生产班组分页 + * + * @param pageReqVO 分页查询 + * @return 生产班组分页 + */ + PageResult getClassesPage(ClassesPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesServiceImpl.java new file mode 100644 index 00000000..85a8b062 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/classes/ClassesServiceImpl.java @@ -0,0 +1,79 @@ +package com.chanko.yunxi.mes.module.heli.service.classes; + +import cn.hutool.core.lang.UUID; +import com.chanko.yunxi.mes.module.heli.enums.CodeEnum; +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.classes.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.classes.ClassesDO; +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.classes.ClassesMapper; + +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 ClassesServiceImpl implements ClassesService { + + @Resource + private ClassesMapper classesMapper; + + @Override + public Long createClasses(ClassesSaveReqVO createReqVO) { + // 插入 + ClassesDO classes = BeanUtils.toBean(createReqVO, ClassesDO.class); + classes.setCode(UUID.fastUUID().toString(true)); + classesMapper.insert(classes); + classes.setCode(CodeEnum.CLASSES.getCode(classes.getId().toString())); + classesMapper.updateById(classes); + // 返回 + return classes.getId(); + } + + @Override + public void updateClasses(ClassesSaveReqVO updateReqVO) { + // 校验存在 + validateClassesExists(updateReqVO.getId()); + // 更新 + ClassesDO updateObj = BeanUtils.toBean(updateReqVO, ClassesDO.class); + classesMapper.updateById(updateObj); + } + + @Override + public void deleteClasses(Long id) { + // 校验存在 + validateClassesExists(id); + // 删除 + classesMapper.deleteById(id); + } + + private void validateClassesExists(Long id) { + if (classesMapper.selectById(id) == null) { + throw exception(CLASSES_NOT_EXISTS); + } + } + + @Override + public ClassesDO getClasses(Long id) { + return classesMapper.selectById(id); + } + + @Override + public PageResult getClassesPage(ClassesPageReqVO pageReqVO) { + return classesMapper.selectPage(pageReqVO); + } + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/classes/ClassesMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/classes/ClassesMapper.xml new file mode 100644 index 00000000..aef73cb7 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/classes/ClassesMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/classes/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/classes/index.ts new file mode 100644 index 00000000..a34dc299 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/classes/index.ts @@ -0,0 +1,42 @@ +import request from '@/config/axios' + +export interface ClassesVO { + id: number + code: string + name: string + workshopId: number + deptId: number + leaderUserId: number + description: string + status: number +} + +// 查询生产班组分页 +export const getClassesPage = async (params) => { + return await request.get({ url: `/heli/classes/page`, params }) +} + +// 查询生产班组详情 +export const getClasses = async (id: number) => { + return await request.get({ url: `/heli/classes/get?id=` + id }) +} + +// 新增生产班组 +export const createClasses = async (data: ClassesVO) => { + return await request.post({ url: `/heli/classes/create`, data }) +} + +// 修改生产班组 +export const updateClasses = async (data: ClassesVO) => { + return await request.put({ url: `/heli/classes/update`, data }) +} + +// 删除生产班组 +export const deleteClasses = async (id: number) => { + return await request.delete({ url: `/heli/classes/delete?id=` + id }) +} + +// 导出生产班组 Excel +export const exportClasses = async (params) => { + return await request.download({ url: `/heli/classes/export-excel`, params }) +} \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue new file mode 100644 index 00000000..7e01c929 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue @@ -0,0 +1,214 @@ + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/index.vue new file mode 100644 index 00000000..6a4279c7 --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/index.vue @@ -0,0 +1,214 @@ + + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue index e6a795ef..2994c87d 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue @@ -28,6 +28,7 @@