更新报表查询

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

@@ -52,6 +52,8 @@ public class WorkOrderProgressController  extends BaseController {
     @Log(title = "生产进度:报工明细", businessType = BusinessType.QUERY)
     @GetMapping("/getFeedbackList")
     public TableDataInfo<WorkOrderProgressFeedbackListResponse> getFeedbackList(Long taskWorkunitId, Long taskId,@RequestParam("workorderCode") String workorderCode) {
+        if(taskWorkunitId == 0)
+            taskWorkunitId = null;
         List<WorkOrderProgressFeedbackListResponse> workOrderProgressFeedbackListResponses = workOrderProgressService.getFeedbackList(workorderCode,taskId,taskWorkunitId);
         return getDataTable(workOrderProgressFeedbackListResponses);
     }

mes/src/main/java/com/ximai/mes/report/response/WorkOrderProgressProcessListResponse.java

@@ -23,5 +23,5 @@ public class WorkOrderProgressProcessListResponse {
     @ApiModelProperty("合格率")
     private BigDecimal passRate;
     private Long taskId;
-    private Long taskWorkunitId;
+    private Long taskWorkunitId = 0L;
 }

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

@@ -3,9 +3,12 @@ package com.ximai.mes.report.service.impl;
 import com.ximai.mes.constant.TaskStatusEnum;
 import com.ximai.mes.pro.domain.ProFeedback;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
+import com.ximai.mes.pro.domain.task.ProTask;
+import com.ximai.mes.pro.domain.task.ProTaskWorkunit;
 import com.ximai.mes.pro.mapper.ProFeedbackMapper;
 import com.ximai.mes.pro.mapper.proWorkOrder.ProWorkorderMapper;
 import com.ximai.mes.pro.mapper.task.ProTaskMapper;
+import com.ximai.mes.pro.mapper.task.ProTaskWorkunitMapper;
 import com.ximai.mes.report.request.WorkOrderProgressRequest;
 import com.ximai.mes.report.response.WorkOrderProgressFeedbackListResponse;
 import com.ximai.mes.report.response.WorkOrderProgressListResponse;
@@ -31,6 +34,8 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
     private ProTaskMapper proTaskMapper;
     @Autowired
     private ProFeedbackMapper proFeedbackMapper;
+    @Autowired
+    ProTaskWorkunitMapper proTaskWorkunitMapper;
     @Override
     @Transactional
     public List<WorkOrderProgressListResponse> getList(WorkOrderProgressRequest workOrderProgressRequest) {
@@ -57,17 +62,41 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
     public List<WorkOrderProgressProcessListResponse> getProcessList(String workorderCode) {
         List<WorkOrderProgressProcessListResponse> workOrderProgressProcessListResponses = proTaskMapper.getProcessList(workorderCode);
         for (WorkOrderProgressProcessListResponse workOrderProgressProcessListResponse : workOrderProgressProcessListResponses){
-            if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.BEGINNING.getStatus())){
-                workOrderProgressProcessListResponse.setStatus("加工中");
-            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.FINISHED.getStatus())){
-                workOrderProgressProcessListResponse.setStatus("已完工");
-            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.PAUSE.getStatus())){
-                workOrderProgressProcessListResponse.setStatus("暂停");
-            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.PREPARE.getStatus())){
+//            if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.BEGINNING.getStatus())){
+//                workOrderProgressProcessListResponse.setStatus("加工中");
+//            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.FINISHED.getStatus())){
+//                workOrderProgressProcessListResponse.setStatus("已完工");
+//            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.PAUSE.getStatus())){
+//                workOrderProgressProcessListResponse.setStatus("暂停");
+//            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.PREPARE.getStatus())){
+//                workOrderProgressProcessListResponse.setStatus("未开工");
+//            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.ERROR_STOP.getStatus())){
+//                workOrderProgressProcessListResponse.setStatus("故障停工");
+//            }
+            ProTaskWorkunit proTaskWorkunitQuery = new ProTaskWorkunit();
+            proTaskWorkunitQuery.setTaskId(workOrderProgressProcessListResponse.getTaskId());
+            List<ProTaskWorkunit> proTaskWorkunitList = proTaskWorkunitMapper.selectProTaskWorkunitList(proTaskWorkunitQuery);
+            if(proTaskWorkunitList.size() > 0){
+                if(proTaskWorkunitList.stream()
+                        .filter(proTaskWorkunit -> proTaskWorkunit.getStatus().equals(TaskStatusEnum.FINISHED.getStatus())).count() == proTaskWorkunitList.size() ){
+                    //下面的所有派工表任务都完工时,标记为完工
+                    workOrderProgressProcessListResponse.setStatus("已完工");
+                }else if(proTaskWorkunitList.stream()
+                        .filter(proTaskWorkunit -> proTaskWorkunit.getStatus().equals(TaskStatusEnum.ERROR_STOP.getStatus())).count() > 0 ){
+                    //下面的所有派工表任务存在有任何一条故障时,标记为故障停工
+                    workOrderProgressProcessListResponse.setStatus("故障停工");
+                }else if(proTaskWorkunitList.stream()
+                        .filter(proTaskWorkunit -> proTaskWorkunit.getStatus().equals(TaskStatusEnum.PREPARE.getStatus())).count() == proTaskWorkunitList.size() ){
+                    //下面的所有派工表任务都未开工时,标记为未开工
+                    workOrderProgressProcessListResponse.setStatus("未开工");
+                }else{
+                    //其他加工中
+                    workOrderProgressProcessListResponse.setStatus("加工中");
+                }
+            }else{
                 workOrderProgressProcessListResponse.setStatus("未开工");
-            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.ERROR_STOP.getStatus())){
-                workOrderProgressProcessListResponse.setStatus("故障停工");
             }
+
             if(workOrderProgressProcessListResponse.getQuantityProduced() != null && workOrderProgressProcessListResponse.getQuantityProduced().compareTo(BigDecimal.ZERO) > 0){
                 if(workOrderProgressProcessListResponse.getQuantityProduced().compareTo(workOrderProgressProcessListResponse.getQuantityQualify()) > 0){
                     workOrderProgressProcessListResponse.setPassRate(workOrderProgressProcessListResponse.getQuantityQualify().multiply(new BigDecimal(100)).

mes/src/main/resources/mapper/pro/task/ProTaskMapper.xml

@@ -407,15 +407,7 @@
     </select>
     <select id="getProcessList"
             resultType="com.ximai.mes.report.response.WorkOrderProgressProcessListResponse">
-        SELECT
-            workunit.* ,
-            task.process_code,
-            task.process_name
-        FROM
-            pro_task task
-                JOIN pro_task_workunit workunit ON workunit.task_id = task.task_id
-        where arrange_code = #{workorderCode}
-        order by task.task_id
+        select * from pro_task where arrange_code = #{workorderCode} order by task_id
     </select>
 
     <insert id="insertProTask" parameterType="ProTask" useGeneratedKeys="true" keyProperty="taskId">