rev：冲突解决

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/ReportEnum.java

@@ -0,0 +1,39 @@
+package org.nl.wms.product_manage;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+import org.nl.common.utils.MapOf;
+import org.nl.modules.common.exception.BadRequestException;
+
+import java.util.Map;
+
+/*
+ * @author ZZQ
+ * @Date 2023/5/4 20:11
+ */
+@AllArgsConstructor
+@Getter
+public enum ReportEnum {
+    //出入库类型
+    REPORT_STATUS(MapOf.of("生成", "1", "报工", "2","报工审核","3")),
+    ;
+    private Map<String, String> code;
+
+    public String code(String desc) {
+        String code = this.getCode().get(desc);
+        if (StringUtils.isNotEmpty(code)) {
+            return code;
+        }
+        throw new BadRequestException(this.name() + "对应类型" + desc + "未定义");
+    }
+
+    public String check(String code) {
+        for (Map.Entry<String, String> entry : this.getCode().entrySet()) {
+            if (entry.getValue().equals("code")) {
+                return entry.getValue();
+            }
+        }
+        throw new BadRequestException(this.name() + "对应类型" + code + "未定义");
+    }
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java

@@ -0,0 +1,25 @@
+package org.nl.wms.product_manage.service.workorder.dto;
+
+import lombok.Data;
+import org.nl.common.domain.query.BaseQuery;
+import org.nl.common.domain.query.QParam;
+import org.nl.common.enums.QueryTEnum;
+import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder;
+import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorderrecord;
+
+import java.util.Date;
+
+/*
+ * @author ZZQ
+ * @Date 2023/4/26 11:05
+ */
+@Data
+public class ReportQuery  {
+
+    private String device_code;
+    private String workorder_code;
+    private String report;
+    private String start_time;
+    private String end_time;
+
+}

mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/SchBaseTaskController.java

@@ -1,21 +0,0 @@
-package org.nl.wms.scheduler_manage.controller.task;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 任务表 前端控制器
- * </p>
- *
- * @author generator
- * @since 2023-05-11
- */
-@RestController
-@RequestMapping("/schBaseTask")
-public class SchBaseTaskController {
-
-}
-