更新生产进度BUG

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

@@ -17,7 +17,7 @@ public enum WorkorderTypeEnum {
     /**
      * 已组合
      */
-    ORDER("501","生产工单");
+    ORDER("510","生产工单");
 
     /**
      * Lock type

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

@@ -14,6 +14,7 @@ import com.ximai.mes.report.response.WorkOrderProgressFeedbackListResponse;
 import com.ximai.mes.report.response.WorkOrderProgressListResponse;
 import com.ximai.mes.report.response.WorkOrderProgressProcessListResponse;
 import com.ximai.mes.report.service.WorkOrderProgressService;
+import com.ximai.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,8 @@ public class WorkOrderProgressController  extends BaseController {
 
     @Autowired
     WorkOrderProgressService workOrderProgressService;
-
+    @Autowired
+    private ISysDictDataService dictDataService;
     @ApiOperation("生产进度:明细界面")
     @PreAuthorize("@ss.hasPermi('mes:pro:feedback:get')")
     @Log(title = "生产进度:明细界面", businessType = BusinessType.QUERY)
@@ -38,9 +40,6 @@ 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);
     }
 
@@ -51,7 +50,8 @@ public class WorkOrderProgressController  extends BaseController {
         List<WorkOrderProgressListResponse> workOrderProgressListResponses = workOrderProgressService.getList(workOrderProgressRequest);
         workOrderProgressListResponses.stream().forEach(workOrderProgressListResponse ->{
             workOrderProgressListResponse.setStatus(WorkorderStatusEnum.get(workOrderProgressListResponse.getStatus()).getEnumName());
-            workOrderProgressListResponse.setWorkorderType(WorkorderTypeEnum.get(workOrderProgressListResponse.getWorkorderType()).getEnumName());
+            workOrderProgressListResponse.setWorkorderType(dictDataService.getDictLabel("mes_workorder_type", workOrderProgressListResponse.getWorkorderType()));
+
         } );
         ExcelUtil<WorkOrderProgressListResponse> util = new ExcelUtil<>(WorkOrderProgressListResponse.class);
         util.exportExcel(response, workOrderProgressListResponses, "生产进度-明细界面导出");

mes/src/main/java/com/ximai/mes/report/service/impl/WorkOrderProgressServiceImp.java

@@ -28,8 +28,7 @@ import java.util.List;
 public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
     @Autowired
     ProWorkorderMapper proWorkorderMapper;
-    @Autowired
-    private ISysDictDataService dictDataService;
+
     @Autowired
     private ProTaskMapper proTaskMapper;
     @Autowired
@@ -41,7 +40,6 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
     public List<WorkOrderProgressListResponse> getList(WorkOrderProgressRequest workOrderProgressRequest) {
         List<WorkOrderProgressListResponse>  workOrderProgressListResponses = proWorkorderMapper.getWorkOrderProgressServiceList(workOrderProgressRequest);
         for (WorkOrderProgressListResponse workOrderProgressListResponse : workOrderProgressListResponses){
-            workOrderProgressListResponse.setWorkorderType(dictDataService.getDictLabel("mes_workorder_type", workOrderProgressListResponse.getWorkorderType()));
             if(workOrderProgressListResponse.getQuantity() != null && workOrderProgressListResponse.getQuantity().compareTo(BigDecimal.ZERO) >0){
                 workOrderProgressListResponse.setQuantityProduced(workOrderProgressListResponse.getQuantityProduced() != null ? workOrderProgressListResponse.getQuantityProduced() : BigDecimal.ZERO);
                 if(workOrderProgressListResponse.getQuantity().compareTo(workOrderProgressListResponse.getQuantityProduced()) > 0){