From 13e6ec043f45421efd4f34f8f9dfbf1e957cbeb3 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Fri, 21 Jun 2024 19:57:55 +0800 Subject: [PATCH] fix mes some status --- .../module/erp/enums/ErpAuditStatus.java | 2 + .../vo/ItemRequisitionPageReqVO.java | 5 +-- .../producereport/vo/ReportStatusEnum.java | 37 +++++++++++++++++++ .../controller/admin/task/TaskController.java | 9 +---- .../admin/task/vo/TaskStatusEnum.java | 15 +++++++- .../ProduceReportDetailMapper.java | 9 +++++ .../module/mes/dal/mysql/task/TaskMapper.java | 9 ++--- 7 files changed, 68 insertions(+), 18 deletions(-) create mode 100644 yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ReportStatusEnum.java diff --git a/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java b/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java index a10147a704..ea178cb915 100644 --- a/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java +++ b/yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java @@ -17,6 +17,8 @@ import java.util.Arrays; @Getter public enum ErpAuditStatus implements IntArrayValuable { + DRAFT(0, "草稿"), // 审核中 + UN_APPROVE(1, "驳回"), // 审核通过 PROCESS(10, "未审核"), // 审核中 APPROVE(20, "已审核"); // 审核通过 diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/vo/ItemRequisitionPageReqVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/vo/ItemRequisitionPageReqVO.java index 18ff7d03d7..579d4bda5b 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/vo/ItemRequisitionPageReqVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/itemrequisition/vo/ItemRequisitionPageReqVO.java @@ -9,7 +9,6 @@ import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 生产领料分页 Request VO") @@ -22,11 +21,11 @@ public class ItemRequisitionPageReqVO extends PageParam { private String code; @Schema(description = "下料时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] requisitionDate; @Schema(description = "领料时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY) + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] deliveryDate; @Schema(description = "状态", example = "2") diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ReportStatusEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ReportStatusEnum.java new file mode 100644 index 0000000000..a03f3b3269 --- /dev/null +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/producereport/vo/ReportStatusEnum.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.mes.controller.admin.producereport.vo; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@AllArgsConstructor +public enum ReportStatusEnum { + + 草稿(0), + 送审(1), + 通过(2), + 驳回(3); + + private final Integer value; + + // 一个可选的方法，用于根据整数值获取对应的枚举实例 + public static ReportStatusEnum fromValue(Integer value) { + for (ReportStatusEnum status : ReportStatusEnum.values()) { + if (status.getValue() == value) { + return status; + } + } + throw new IllegalArgumentException("Unknown value: " + value); + } + //返回状态 + public static List getEnableEditStatus(){ + List statusList = new ArrayList<>(); + statusList.add(ReportStatusEnum.草稿.getValue()); + statusList.add(ReportStatusEnum.送审.getValue()); + statusList.add(ReportStatusEnum.驳回.getValue()); + return statusList; + } +} \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java index 639d269261..8600aa2210 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/TaskController.java @@ -73,14 +73,7 @@ public class TaskController { @GetMapping("/getTaskList") @Operation(summary = "获得可查询计划的生产任务单列表") public CommonResult> getTaskList() { - List statusList = new ArrayList<>(); - statusList.add(TaskStatusEnum.下达.getValue()); - statusList.add(TaskStatusEnum.计划.getValue()); - statusList.add(TaskStatusEnum.开工.getValue()); - statusList.add(TaskStatusEnum.完工.getValue()); - statusList.add(TaskStatusEnum.入库.getValue()); - List taskDOList = taskService.selectList(statusList); - + List taskDOList = taskService.selectList(TaskStatusEnum.getEnablePlanStatus()); return success(taskDOList); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskStatusEnum.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskStatusEnum.java index 66417ddeb3..8de18e6fe6 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskStatusEnum.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskStatusEnum.java @@ -3,6 +3,9 @@ package cn.iocoder.yudao.module.mes.controller.admin.task.vo; import lombok.AllArgsConstructor; import lombok.Getter; +import java.util.ArrayList; +import java.util.List; + @Getter @AllArgsConstructor public enum TaskStatusEnum { @@ -15,7 +18,7 @@ public enum TaskStatusEnum { 完工(5), 入库(6); - private final int value; + private final Integer value; // 一个可选的方法，用于根据整数值获取对应的枚举实例 public static TaskStatusEnum fromValue(int value) { @@ -26,4 +29,14 @@ public enum TaskStatusEnum { } throw new IllegalArgumentException("Unknown value: " + value); } + //返回能汇总计划数的状态 + public static List getEnablePlanStatus(){ + List statusList = new ArrayList<>(); + statusList.add(TaskStatusEnum.下达.getValue()); + statusList.add(TaskStatusEnum.计划.getValue()); + statusList.add(TaskStatusEnum.开工.getValue()); + statusList.add(TaskStatusEnum.完工.getValue()); + statusList.add(TaskStatusEnum.入库.getValue()); + return statusList; + } } \ No newline at end of file diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java index b6e9b32f32..824225ea6a 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/producereport/ProduceReportDetailMapper.java @@ -5,9 +5,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.mes.controller.admin.producereport.vo.ProduceReportDetailPageReqVO; +import cn.iocoder.yudao.module.mes.controller.admin.producereport.vo.ReportStatusEnum; import cn.iocoder.yudao.module.mes.dal.dataobject.producereport.ProduceReportDetailDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 生产报工明细 Mapper * @@ -17,6 +20,11 @@ import org.apache.ibatis.annotations.Mapper; public interface ProduceReportDetailMapper extends BaseMapperX { default PageResult selectPage(ProduceReportDetailPageReqVO reqVO) { + List status =null; + if(reqVO.getReportStatus() == 100){ + status = ReportStatusEnum.getEnableEditStatus(); + reqVO.setReportStatus(null); + } return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ProduceReportDetailDO::getReportId, reqVO.getReportId()) .eqIfPresent(ProduceReportDetailDO::getPlanId, reqVO.getPlanId()) @@ -35,6 +43,7 @@ public interface ProduceReportDetailMapper extends BaseMapperX { } default PageResult selectPage2(TaskPageReqVO reqVO) { - List statusList = new ArrayList<>(); - statusList.add(TaskStatusEnum.下达.getValue()); - statusList.add(TaskStatusEnum.计划.getValue()); - statusList.add(TaskStatusEnum.开工.getValue()); + return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(TaskDO::getCode, reqVO.getCode()) .betweenIfPresent(TaskDO::getOrderDate, reqVO.getOrderDate()) .betweenIfPresent(TaskDO::getDeliveryDate, reqVO.getDeliveryDate()) - .inIfPresent(TaskDO::getStatus, statusList) + .inIfPresent(TaskDO::getStatus, TaskStatusEnum.getEnablePlanStatus()) + .eqIfPresent(TaskDO::getStatus, reqVO.getStatus()) .eqIfPresent(TaskDO::getProcessInstanceId, reqVO.getProcessInstanceId()) .eqIfPresent(TaskDO::getRemark, reqVO.getRemark()) .betweenIfPresent(TaskDO::getCreateTime, reqVO.getCreateTime())