fix mes some status

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, "已审核"); // 审核通过
 

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")

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<Integer> getEnableEditStatus(){
+        List<Integer> statusList = new ArrayList<>();
+        statusList.add(ReportStatusEnum.草稿.getValue());
+        statusList.add(ReportStatusEnum.送审.getValue());
+        statusList.add(ReportStatusEnum.驳回.getValue());
+        return statusList;
+    }
+}

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<List<TaskDO>> getTaskList() {
-        List<Integer> statusList = new ArrayList<>();
+        List<TaskDO> taskDOList = taskService.selectList(TaskStatusEnum.getEnablePlanStatus());
-        statusList.add(TaskStatusEnum.下达.getValue());
-        statusList.add(TaskStatusEnum.计划.getValue());
-        statusList.add(TaskStatusEnum.开工.getValue());
-        statusList.add(TaskStatusEnum.完工.getValue());
-        statusList.add(TaskStatusEnum.入库.getValue());
-        List<TaskDO> taskDOList = taskService.selectList(statusList);
-
         return success(taskDOList);
     }
 

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<Integer> getEnablePlanStatus(){
+        List<Integer> 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;
+    }
 }

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<ProduceReportDetailDO> {
 
     default PageResult<ProduceReportDetailDO> selectPage(ProduceReportDetailPageReqVO reqVO) {
+        List<Integer> status =null;
+        if(reqVO.getReportStatus() == 100){
+            status = ReportStatusEnum.getEnableEditStatus();
+            reqVO.setReportStatus(null);
+        }
         return selectPage(reqVO, new LambdaQueryWrapperX<ProduceReportDetailDO>()
                 .eqIfPresent(ProduceReportDetailDO::getReportId, reqVO.getReportId())
                 .eqIfPresent(ProduceReportDetailDO::getPlanId, reqVO.getPlanId())
@@ -35,6 +43,7 @@ public interface ProduceReportDetailMapper extends BaseMapperX<ProduceReportDeta
                 .eqIfPresent(ProduceReportDetailDO::getTotalNumber, reqVO.getTotalNumber())
                 .betweenIfPresent(ProduceReportDetailDO::getReportDate, reqVO.getReportDate())
                 .eqIfPresent(ProduceReportDetailDO::getReportStatus, reqVO.getReportStatus())
+                .inIfPresent(ProduceReportDetailDO::getReportStatus, status)
                 .orderByDesc(ProduceReportDetailDO::getId));
     }
 

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/task/TaskMapper.java

@@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.mes.controller.admin.task.vo.TaskStatusEnum;
 import cn.iocoder.yudao.module.mes.dal.dataobject.task.TaskDO;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -32,15 +31,13 @@ public interface TaskMapper extends BaseMapperX<TaskDO> {
     }
 
     default PageResult<TaskDO> selectPage2(TaskPageReqVO reqVO) {
-        List<Integer> statusList = new ArrayList<>();
+
-        statusList.add(TaskStatusEnum.下达.getValue());
-        statusList.add(TaskStatusEnum.计划.getValue());
-        statusList.add(TaskStatusEnum.开工.getValue());
         return selectPage(reqVO, new LambdaQueryWrapperX<TaskDO>()
                 .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())