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 5855cc11..fdd9b8a0 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 @@ -16,6 +16,7 @@ import com.chanko.yunxi.mes.framework.common.exception.ErrorCode; * 003 库存管理 * 004 订单管理 * 005 发货管理 + * 006 工艺设计 * 第三段,3 位,错误码 */ public interface ErrorCodeConstants { @@ -54,4 +55,6 @@ public interface ErrorCodeConstants { ErrorCode DELIVER_ORDER_NOT_EXISTS = new ErrorCode(1_005_001, "发货订单不存在"); ErrorCode RELATION_PROJECT_ORDER_HAS_DONE = new ErrorCode(1_005_002, "关联项目订单已经发货完成"); ErrorCode DELIVER_AMOUNT_OVERFLOW = new ErrorCode(1_005_003, "超额发货"); + /************工艺设计***********/ + ErrorCode PROCESS_DESIGN_NOT_EXISTS = new ErrorCode(1_006_001, "工艺设计不存在"); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java new file mode 100644 index 00000000..4db88681 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/ProcessDesignController.java @@ -0,0 +1,106 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.processdesign; + +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.processdesign.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesign.ProcessDesignDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesignprogress.ProcessDesignProgressDO; +import com.chanko.yunxi.mes.module.heli.service.processdesign.ProcessDesignService; + +@Tag(name = "管理后台 - 工艺设计") +@RestController +@RequestMapping("/heli/process-design") +@Validated +public class ProcessDesignController { + + @Resource + private ProcessDesignService processDesignService; + + @PostMapping("/create") + @Operation(summary = "创建工艺设计") + @PreAuthorize("@ss.hasPermission('heli:process-design:create')") + public CommonResult createProcessDesign(@Valid @RequestBody ProcessDesignSaveReqVO createReqVO) { + return success(processDesignService.createProcessDesign(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新工艺设计") + @PreAuthorize("@ss.hasPermission('heli:process-design:update')") + public CommonResult updateProcessDesign(@Valid @RequestBody ProcessDesignSaveReqVO updateReqVO) { + processDesignService.updateProcessDesign(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除工艺设计") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('heli:process-design:delete')") + public CommonResult deleteProcessDesign(@RequestParam("id") Long id) { + processDesignService.deleteProcessDesign(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得工艺设计") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('heli:process-design:query')") + public CommonResult getProcessDesign(@RequestParam("id") Long id) { + ProcessDesignDO processDesign = processDesignService.getProcessDesign(id); + return success(BeanUtils.toBean(processDesign, ProcessDesignRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得工艺设计分页") + @PreAuthorize("@ss.hasPermission('heli:process-design:query')") + public CommonResult> getProcessDesignPage(@Valid ProcessDesignPageReqVO pageReqVO) { + PageResult pageResult = processDesignService.getProcessDesignPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, ProcessDesignRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出工艺设计 Excel") + @PreAuthorize("@ss.hasPermission('heli:process-design:export')") + @OperateLog(type = EXPORT) + public void exportProcessDesignExcel(@Valid ProcessDesignPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = processDesignService.getProcessDesignPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "工艺设计.xls", "数据", ProcessDesignRespVO.class, + BeanUtils.toBean(list, ProcessDesignRespVO.class)); + } + + // ==================== 子表(工艺设计进度) ==================== + + @GetMapping("/process-design-progress/list-by-process-design-id") + @Operation(summary = "获得工艺设计进度列表") + @Parameter(name = "processDesignId", description = "工艺设计id") + @PreAuthorize("@ss.hasPermission('heli:process-design:query')") + public CommonResult> getProcessDesignProgressListByProcessDesignId(@RequestParam("processDesignId") Long processDesignId) { + return success(processDesignService.getProcessDesignProgressListByProcessDesignId(processDesignId)); + } + +} \ 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/processdesign/vo/ProcessDesignPageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java new file mode 100644 index 00000000..3e78bfa6 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java @@ -0,0 +1,40 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.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 ProcessDesignPageReqVO extends PageParam { + + @Schema(description = "生产计划id", example = "87") + private Long planId; + + @Schema(description = "销售订单id", example = "27757") + private Long saleOrderId; + + @Schema(description = "销售订单子项id", example = "7018") + private Long saleOrderSubId; + + @Schema(description = "设计类型 铸造工艺|3D图纸|2D图纸|毛坯图纸 FOUNDRY_TECHNOLOGY_BLUEPRINT|3D_BLUEPRINT|2D_BLUEPRINT|WORKBLANK_BLUEPRINT", example = "1") + private String processDesignType; + + @Schema(description = "备注", example = "随便") + private String remark; + + @Schema(description = "状态,1表示正常,2表示禁用", example = "2") + 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/processdesign/vo/ProcessDesignRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java new file mode 100644 index 00000000..e2e62ec5 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignRespVO.java @@ -0,0 +1,48 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.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 ProcessDesignRespVO { + + @Schema(description = "自增字段,唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "13152") + @ExcelProperty("自增字段,唯一") + private Long id; + + @Schema(description = "生产计划id", requiredMode = Schema.RequiredMode.REQUIRED, example = "87") + @ExcelProperty("生产计划id") + private Long planId; + + @Schema(description = "销售订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27757") + @ExcelProperty("销售订单id") + private Long saleOrderId; + + @Schema(description = "销售订单子项id", example = "7018") + @ExcelProperty("销售订单子项id") + private Long saleOrderSubId; + + @Schema(description = "设计类型 铸造工艺|3D图纸|2D图纸|毛坯图纸 FOUNDRY_TECHNOLOGY_BLUEPRINT|3D_BLUEPRINT|2D_BLUEPRINT|WORKBLANK_BLUEPRINT", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("设计类型 铸造工艺|3D图纸|2D图纸|毛坯图纸 FOUNDRY_TECHNOLOGY_BLUEPRINT|3D_BLUEPRINT|2D_BLUEPRINT|WORKBLANK_BLUEPRINT") + private String processDesignType; + + @Schema(description = "备注", example = "随便") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "状态,1表示正常,2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("状态,1表示正常,2表示禁用") + private Integer status; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + 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/processdesign/vo/ProcessDesignSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqVO.java new file mode 100644 index 00000000..54d58081 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignSaveReqVO.java @@ -0,0 +1,42 @@ +package com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.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.processdesignprogress.ProcessDesignProgressDO; + +@Schema(description = "管理后台 - 工艺设计新增/修改 Request VO") +@Data +public class ProcessDesignSaveReqVO { + + @Schema(description = "自增字段,唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "13152") + private Long id; + + @Schema(description = "生产计划id", requiredMode = Schema.RequiredMode.REQUIRED, example = "87") + @NotNull(message = "生产计划id不能为空") + private Long planId; + + @Schema(description = "销售订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27757") + @NotNull(message = "销售订单id不能为空") + private Long saleOrderId; + + @Schema(description = "销售订单子项id", example = "7018") + private Long saleOrderSubId; + + @Schema(description = "设计类型 铸造工艺|3D图纸|2D图纸|毛坯图纸 FOUNDRY_TECHNOLOGY_BLUEPRINT|3D_BLUEPRINT|2D_BLUEPRINT|WORKBLANK_BLUEPRINT", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "设计类型 铸造工艺|3D图纸|2D图纸|毛坯图纸 FOUNDRY_TECHNOLOGY_BLUEPRINT|3D_BLUEPRINT|2D_BLUEPRINT|WORKBLANK_BLUEPRINT不能为空") + private String processDesignType; + + @Schema(description = "备注", example = "随便") + private String remark; + + @Schema(description = "状态,1表示正常,2表示禁用", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "状态,1表示正常,2表示禁用不能为空") + private Integer status; + + @Schema(description = "工艺设计进度列表") + private List processDesignProgresss; + +} \ 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/processdesign/ProcessDesignDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java new file mode 100644 index 00000000..cb8df2d7 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java @@ -0,0 +1,55 @@ +package com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesign; + +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_process_design") +@KeySequence("pro_process_design_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ProcessDesignDO extends BaseDO { + + /** + * 自增字段,唯一 + */ + @TableId + private Long id; + /** + * 生产计划id + */ + private Long planId; + /** + * 销售订单id + */ + private Long saleOrderId; + /** + * 销售订单子项id + */ + private Long saleOrderSubId; + /** + * 设计类型 铸造工艺|3D图纸|2D图纸|毛坯图纸 FOUNDRY_TECHNOLOGY_BLUEPRINT|3D_BLUEPRINT|2D_BLUEPRINT|WORKBLANK_BLUEPRINT + */ + private String processDesignType; + /** + * 备注 + */ + private String remark; + /** + * 状态,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/processdesign/ProcessDesignProgressDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignProgressDO.java new file mode 100644 index 00000000..840090c0 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignProgressDO.java @@ -0,0 +1,52 @@ +package com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesignprogress; + +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_process_design_progress") +@KeySequence("pro_process_design_progress_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库,可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ProcessDesignProgressDO extends BaseDO { + + /** + * 自增字段,唯一 + */ + @TableId + private Long id; + /** + * 工艺设计id + */ + private Long processDesignId; + /** + * 进度百分比(%) + */ + private BigDecimal progress; + /** + * 图纸链接 + */ + private String blueprintLink; + /** + * 备注 + */ + private String remark; + /** + * 状态,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/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java new file mode 100644 index 00000000..9ef6257c --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java @@ -0,0 +1,32 @@ +package com.chanko.yunxi.mes.module.heli.dal.mysql.processdesign; + +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.processdesign.ProcessDesignDO; +import org.apache.ibatis.annotations.Mapper; +import com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo.*; + +/** + * 工艺设计 Mapper + * + * @author 管理员 + */ +@Mapper +public interface ProcessDesignMapper extends BaseMapperX { + + default PageResult selectPage(ProcessDesignPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ProcessDesignDO::getPlanId, reqVO.getPlanId()) + .eqIfPresent(ProcessDesignDO::getSaleOrderId, reqVO.getSaleOrderId()) + .eqIfPresent(ProcessDesignDO::getSaleOrderSubId, reqVO.getSaleOrderSubId()) + .eqIfPresent(ProcessDesignDO::getProcessDesignType, reqVO.getProcessDesignType()) + .eqIfPresent(ProcessDesignDO::getRemark, reqVO.getRemark()) + .eqIfPresent(ProcessDesignDO::getStatus, reqVO.getStatus()) + .betweenIfPresent(ProcessDesignDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(ProcessDesignDO::getId)); + } + +} \ 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/mysql/processdesign/ProcessDesignProgressMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignProgressMapper.java new file mode 100644 index 00000000..bf16ff47 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignProgressMapper.java @@ -0,0 +1,28 @@ +package com.chanko.yunxi.mes.module.heli.dal.mysql.processdesignprogress; + +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.processdesignprogress.ProcessDesignProgressDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 工艺设计进度 Mapper + * + * @author 管理员 + */ +@Mapper +public interface ProcessDesignProgressMapper extends BaseMapperX { + + default List selectListByProcessDesignId(Long processDesignId) { + return selectList(ProcessDesignProgressDO::getProcessDesignId, processDesignId); + } + + default int deleteByProcessDesignId(Long processDesignId) { + return delete(ProcessDesignProgressDO::getProcessDesignId, processDesignId); + } + +} \ 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/processdesign/ProcessDesignService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java new file mode 100644 index 00000000..6a3b9bbd --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignService.java @@ -0,0 +1,66 @@ +package com.chanko.yunxi.mes.module.heli.service.processdesign; + +import java.util.*; +import javax.validation.*; +import com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesign.ProcessDesignDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesignprogress.ProcessDesignProgressDO; +import com.chanko.yunxi.mes.framework.common.pojo.PageResult; +import com.chanko.yunxi.mes.framework.common.pojo.PageParam; + +/** + * 工艺设计 Service 接口 + * + * @author 管理员 + */ +public interface ProcessDesignService { + + /** + * 创建工艺设计 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createProcessDesign(@Valid ProcessDesignSaveReqVO createReqVO); + + /** + * 更新工艺设计 + * + * @param updateReqVO 更新信息 + */ + void updateProcessDesign(@Valid ProcessDesignSaveReqVO updateReqVO); + + /** + * 删除工艺设计 + * + * @param id 编号 + */ + void deleteProcessDesign(Long id); + + /** + * 获得工艺设计 + * + * @param id 编号 + * @return 工艺设计 + */ + ProcessDesignDO getProcessDesign(Long id); + + /** + * 获得工艺设计分页 + * + * @param pageReqVO 分页查询 + * @return 工艺设计分页 + */ + PageResult getProcessDesignPage(ProcessDesignPageReqVO pageReqVO); + + // ==================== 子表(工艺设计进度) ==================== + + /** + * 获得工艺设计进度列表 + * + * @param processDesignId 工艺设计id + * @return 工艺设计进度列表 + */ + List getProcessDesignProgressListByProcessDesignId(Long processDesignId); + +} \ 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/processdesign/ProcessDesignServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java new file mode 100644 index 00000000..990abc99 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java @@ -0,0 +1,112 @@ +package com.chanko.yunxi.mes.module.heli.service.processdesign; + +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.processdesign.vo.*; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesign.ProcessDesignDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesignprogress.ProcessDesignProgressDO; +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.processdesign.ProcessDesignMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.processdesignprogress.ProcessDesignProgressMapper; + +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 ProcessDesignServiceImpl implements ProcessDesignService { + + @Resource + private ProcessDesignMapper processDesignMapper; + @Resource + private ProcessDesignProgressMapper processDesignProgressMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public Long createProcessDesign(ProcessDesignSaveReqVO createReqVO) { + // 插入 + ProcessDesignDO processDesign = BeanUtils.toBean(createReqVO, ProcessDesignDO.class); + processDesignMapper.insert(processDesign); + + // 插入子表 + createProcessDesignProgressList(processDesign.getId(), createReqVO.getProcessDesignProgresss()); + // 返回 + return processDesign.getId(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void updateProcessDesign(ProcessDesignSaveReqVO updateReqVO) { + // 校验存在 + validateProcessDesignExists(updateReqVO.getId()); + // 更新 + ProcessDesignDO updateObj = BeanUtils.toBean(updateReqVO, ProcessDesignDO.class); + processDesignMapper.updateById(updateObj); + + // 更新子表 + updateProcessDesignProgressList(updateReqVO.getId(), updateReqVO.getProcessDesignProgresss()); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteProcessDesign(Long id) { + // 校验存在 + validateProcessDesignExists(id); + // 删除 + processDesignMapper.deleteById(id); + + // 删除子表 + deleteProcessDesignProgressByProcessDesignId(id); + } + + private void validateProcessDesignExists(Long id) { + if (processDesignMapper.selectById(id) == null) { + throw exception(PROCESS_DESIGN_NOT_EXISTS); + } + } + + @Override + public ProcessDesignDO getProcessDesign(Long id) { + return processDesignMapper.selectById(id); + } + + @Override + public PageResult getProcessDesignPage(ProcessDesignPageReqVO pageReqVO) { + return processDesignMapper.selectPage(pageReqVO); + } + + // ==================== 子表(工艺设计进度) ==================== + + @Override + public List getProcessDesignProgressListByProcessDesignId(Long processDesignId) { + return processDesignProgressMapper.selectListByProcessDesignId(processDesignId); + } + + private void createProcessDesignProgressList(Long processDesignId, List list) { + list.forEach(o -> o.setProcessDesignId(processDesignId)); + processDesignProgressMapper.insertBatch(list); + } + + private void updateProcessDesignProgressList(Long processDesignId, List list) { + deleteProcessDesignProgressByProcessDesignId(processDesignId); + list.forEach(o -> o.setId(null).setUpdater(null).setUpdateTime(null)); // 解决更新情况下:1)id 冲突;2)updateTime 不更新 + createProcessDesignProgressList(processDesignId, list); + } + + private void deleteProcessDesignProgressByProcessDesignId(Long processDesignId) { + processDesignProgressMapper.deleteByProcessDesignId(processDesignId); + } + +} \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processdesign/ProcessDesignMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processdesign/ProcessDesignMapper.xml new file mode 100644 index 00000000..977e7839 --- /dev/null +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processdesign/ProcessDesignMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/processdesign/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/processdesign/index.ts new file mode 100644 index 00000000..5feae98d --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/processdesign/index.ts @@ -0,0 +1,48 @@ +import request from '@/config/axios' + +export interface ProcessDesignVO { + id: number + planId: number + saleOrderId: number + saleOrderSubId: number + processDesignType: string + remark: string + status: number +} + +// 查询工艺设计分页 +export const getProcessDesignPage = async (params) => { + return await request.get({ url: `/heli/process-design/page`, params }) +} + +// 查询工艺设计详情 +export const getProcessDesign = async (id: number) => { + return await request.get({ url: `/heli/process-design/get?id=` + id }) +} + +// 新增工艺设计 +export const createProcessDesign = async (data: ProcessDesignVO) => { + return await request.post({ url: `/heli/process-design/create`, data }) +} + +// 修改工艺设计 +export const updateProcessDesign = async (data: ProcessDesignVO) => { + return await request.put({ url: `/heli/process-design/update`, data }) +} + +// 删除工艺设计 +export const deleteProcessDesign = async (id: number) => { + return await request.delete({ url: `/heli/process-design/delete?id=` + id }) +} + +// 导出工艺设计 Excel +export const exportProcessDesign = async (params) => { + return await request.download({ url: `/heli/process-design/export-excel`, params }) +} + +// ==================== 子表(工艺设计进度) ==================== + +// 获得工艺设计进度列表 +export const getProcessDesignProgressListByProcessDesignId = async (processDesignId) => { + return await request.get({ url: `/heli/process-design/process-design-progress/list-by-process-design-id?processDesignId=` + processDesignId }) +} \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/ProcessDesignForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/ProcessDesignForm.vue new file mode 100644 index 00000000..6290b3ba --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/ProcessDesignForm.vue @@ -0,0 +1,141 @@ + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/components/ProcessDesignProgressForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/components/ProcessDesignProgressForm.vue new file mode 100644 index 00000000..6532f33a --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/components/ProcessDesignProgressForm.vue @@ -0,0 +1,119 @@ + + \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue new file mode 100644 index 00000000..0a7d494a --- /dev/null +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/index.vue @@ -0,0 +1,243 @@ + + + \ No newline at end of file