更新生产进度BUG

mes/src/main/java/com/ximai/mes/constant/WorkorderTypeEnum.java

+package com.ximai.mes.constant;
+
+/**
+ * @ Author: chicheng.li
+ * @ Date  : 2024/2/4
+ */
+public enum WorkorderTypeEnum {
+
+    /**
+     * 待发布
+     */
+    COMPLEMENTS("complements","补数订单"),
+    /**
+     * 已发布
+     */
+    PROTOTYPE("prototype","打样订单"),
+    /**
+     * 已组合
+     */
+    ORDER("501","生产工单");
+
+    /**
+     * Lock type
+     */
+    private final String status;
+
+    /**
+     * 枚举名称
+     */
+    public String enumName;
+
+    WorkorderTypeEnum(String status, String enumName) {
+        this.status = status;
+        this.enumName = enumName;
+    }
+
+    public String getEnumName() {
+        return enumName;
+    }
+    /**
+     * Constructor with field of type
+     */
+    private WorkorderTypeEnum(String status) {
+        this.status = status;
+    }
+
+    public String getValue() {
+        return status;
+    }
+
+
+    public static WorkorderTypeEnum get(String value) {
+        for (WorkorderTypeEnum temp : WorkorderTypeEnum.values()) {
+            if (temp.getValue().equals(value)) {
+                return temp;
+            }
+        }
+        return null;
+    }
+}

mes/src/main/java/com/ximai/mes/report/controller/WorkOrderProgressController.java

@@ -6,6 +6,7 @@ import com.ximai.common.core.page.TableDataInfo;
 import com.ximai.common.enums.BusinessType;
 import com.ximai.common.utils.poi.ExcelUtil;
 import com.ximai.mes.constant.WorkorderStatusEnum;
+import com.ximai.mes.constant.WorkorderTypeEnum;
 import com.ximai.mes.report.request.FeedbackRequest;
 import com.ximai.mes.report.request.WorkOrderProgressRequest;
 import com.ximai.mes.report.response.FeedbackResponse;
@@ -37,6 +38,9 @@ public class WorkOrderProgressController  extends BaseController {
     public TableDataInfo<WorkOrderProgressListResponse> getList( WorkOrderProgressRequest workOrderProgressRequest) {
         startPage();
         List<WorkOrderProgressListResponse> workOrderProgressListResponses = workOrderProgressService.getList(workOrderProgressRequest);
+        workOrderProgressListResponses.stream().forEach(workOrderProgressListResponse ->{
+            workOrderProgressListResponse.setWorkorderType(WorkorderTypeEnum.get(workOrderProgressListResponse.getWorkorderType()).getEnumName());
+        } );
         return getDataTable(workOrderProgressListResponses);
     }
 
@@ -45,7 +49,10 @@ public class WorkOrderProgressController  extends BaseController {
     @PostMapping("/getList/export")
     public void export(HttpServletResponse response, WorkOrderProgressRequest workOrderProgressRequest) {
         List<WorkOrderProgressListResponse> workOrderProgressListResponses = workOrderProgressService.getList(workOrderProgressRequest);
-        workOrderProgressListResponses.stream().forEach(workOrderProgressListResponse -> workOrderProgressListResponse.setStatus(WorkorderStatusEnum.get(workOrderProgressListResponse.getStatus()).getEnumName()));
+        workOrderProgressListResponses.stream().forEach(workOrderProgressListResponse ->{
+            workOrderProgressListResponse.setStatus(WorkorderStatusEnum.get(workOrderProgressListResponse.getStatus()).getEnumName());
+            workOrderProgressListResponse.setWorkorderType(WorkorderTypeEnum.get(workOrderProgressListResponse.getWorkorderType()).getEnumName());
+        } );
         ExcelUtil<WorkOrderProgressListResponse> util = new ExcelUtil<>(WorkOrderProgressListResponse.class);
         util.exportExcel(response, workOrderProgressListResponses, "生产进度-明细界面导出");
     }