Merge remote-tracking branch 'origin/dev' into dev

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{
-                    temp.add("expireFinish");
-                }
+                    || s.getQuantity().compareTo(s.getQuantityProduced())<=0){
+                temp.add("finish");
+            }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")){

mes/src/main/java/com/ximai/mes/pro/mapper/task/ProTaskWorkunitMapper.java

@@ -198,7 +198,7 @@ public interface ProTaskWorkunitMapper extends BaseMapper<ProTaskWorkunit> {
             "\t, wo.product_code as item_code, wo.product_name as item_name, wo.customer_project_no, wo.order_code, t.specification\n" +
             "\t, t.unit_of_measure, ptw.task_workunit_id, ptw.quantity, ptw.create_by, t.quantity_wait\n" +
             "\t, ptw.quantity_produced\n" +
-            "\t, ptw.schedule_start_date, t.duration, ptw.schedule_end_date\n" +
+            "\t, ptw.schedule_start_date, t.duration, ptw.schedule_end_date, ptw.actual_end_date\n" +
             "\t, t.ordinal as idx, t.create_time, t.update_by\n" +
             "\t, t.update_time, ptw.STATUS, ptw.quantity_qualify, ptw.remark, ptw.quantity_unqualify\n" +
             "\t, wo.workorder_code, wu.line_name\n" +