更新报表查询

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

@@ -51,7 +51,7 @@ public class WorkOrderProgressController  extends BaseController {
     @PreAuthorize("@ss.hasPermi('mes:pro:feedback:get')")
     @Log(title = "生产进度:报工明细", businessType = BusinessType.QUERY)
     @GetMapping("/getFeedbackList")
-    public TableDataInfo<WorkOrderProgressFeedbackListResponse> getFeedbackList(@RequestParam("taskWorkunitId")Long taskWorkunitId,@RequestParam("taskId") Long taskId,@RequestParam("workorderCode") String workorderCode) {
+    public TableDataInfo<WorkOrderProgressFeedbackListResponse> getFeedbackList(Long taskWorkunitId, Long taskId,@RequestParam("workorderCode") String workorderCode) {
         List<WorkOrderProgressFeedbackListResponse> workOrderProgressFeedbackListResponses = workOrderProgressService.getFeedbackList(workorderCode,taskId,taskWorkunitId);
         return getDataTable(workOrderProgressFeedbackListResponses);
     }

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

@@ -39,7 +39,12 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
             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);
-                workOrderProgressListResponse.setQuantityMu(workOrderProgressListResponse.getQuantityProduced().multiply(new BigDecimal(100)).divide(workOrderProgressListResponse.getQuantity()).setScale(2, RoundingMode.HALF_UP));
+                if(workOrderProgressListResponse.getQuantity().compareTo(workOrderProgressListResponse.getQuantityProduced()) > 0){
+                    workOrderProgressListResponse.setQuantityMu(workOrderProgressListResponse.getQuantityProduced().multiply(new BigDecimal(100)).divide(workOrderProgressListResponse.getQuantity(),2, RoundingMode.HALF_UP));
+                }else{
+                    workOrderProgressListResponse.setQuantityMu(new BigDecimal(100));
+
+                }
             }else{
                 workOrderProgressListResponse.setQuantityMu(new BigDecimal(100));
 
@@ -52,22 +57,25 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
     public List<WorkOrderProgressProcessListResponse> getProcessList(String workorderCode) {
         List<WorkOrderProgressProcessListResponse> workOrderProgressProcessListResponses = proTaskMapper.getProcessList(workorderCode);
         for (WorkOrderProgressProcessListResponse workOrderProgressProcessListResponse : workOrderProgressProcessListResponses){
-            if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.BEGINNING.getStatus())){
+            if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.BEGINNING.getStatus())){
                 workOrderProgressProcessListResponse.setStatus("加工中");
-            }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.FINISHED.getStatus())){
+            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.FINISHED.getStatus())){
                 workOrderProgressProcessListResponse.setStatus("已完工");
-            }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.PAUSE.getStatus())){
+            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.PAUSE.getStatus())){
                 workOrderProgressProcessListResponse.setStatus("暂停");
-            }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.PREPARE.getStatus())){
+            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.PREPARE.getStatus())){
                 workOrderProgressProcessListResponse.setStatus("未开工");
-            }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.ERROR_STOP.getStatus())){
+            }else if(workOrderProgressProcessListResponse.getStatus().equals(TaskStatusEnum.ERROR_STOP.getStatus())){
                 workOrderProgressProcessListResponse.setStatus("故障停工");
             }
             if(workOrderProgressProcessListResponse.getQuantityProduced() != null && workOrderProgressProcessListResponse.getQuantityProduced().compareTo(BigDecimal.ZERO) > 0){
-                workOrderProgressProcessListResponse.setPassRate(workOrderProgressProcessListResponse.getQuantityQualify().multiply(new BigDecimal(100)).
-                        divide(workOrderProgressProcessListResponse.getQuantityProduced(),2, RoundingMode.HALF_UP));
+                if(workOrderProgressProcessListResponse.getQuantityProduced().compareTo(workOrderProgressProcessListResponse.getQuantityQualify()) > 0){
+                    workOrderProgressProcessListResponse.setPassRate(workOrderProgressProcessListResponse.getQuantityQualify().multiply(new BigDecimal(100)).
+                            divide(workOrderProgressProcessListResponse.getQuantityProduced(),2, RoundingMode.HALF_UP));
+                }else{
+                    workOrderProgressProcessListResponse.setPassRate(new BigDecimal(100));
+                }
             }else{
-
                 workOrderProgressProcessListResponse.setPassRate(BigDecimal.ZERO);
             }
         }