生产计划看板BUG修复

mes/src/main/java/com/ximai/mes/kanban/service/KanbanTaskService.java

@@ -308,20 +308,26 @@ public class KanbanTaskService {
 
     private int getWorkunitState(List<ProTaskWorkunitDto> list){
         Set<String> temp = new HashSet<>();
+        if(list.get(0).getItemCode().equals("1872766-21-A") && list.get(0).getProcessName().equals("ยิงรีเวท")){
+            System.out.print(list.get(0));
+        }
         list.forEach(s->{
+            Date actualEndDate = s.getActualEndDate();
+            if(actualEndDate==null){
+                actualEndDate = new Date();
+            }
             if(s.getStatus().equals(TaskWorkunitStatusEnum.FINISHED.getStatus())
                     || s.getQuantity().compareTo(s.getQuantityProduced())<=0){
-                if(s.getActualEndDate()==null){
-                    temp.add("finish");
-                }else if(s.getActualEndDate().compareTo(s.getScheduleEndDate())<=0){
                 temp.add("finish");
-                }else{
+            }else if(actualEndDate.compareTo(s.getScheduleEndDate())>0){
                 temp.add("expireFinish");
-                }
             }else{
                 temp.add("other");
             }
         });
+        if(list.get(0).getItemCode().equals("1872766-21-A")){
+            System.out.print(list.get(0));
+        }
         if(temp.contains("other")){
             return 0;
         }else if(temp.contains("expireFinish")){