报工时间逻辑判断

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -718,10 +718,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         }
         // 如果找不到则再根据计划开始时间找
         if (CollectionUtils.isEmpty(list)) {
-            String beginTime =productionRecord.getLotNo() + " " + currentShift.getStartTime();
-            Date beginDate = transfer(beginTime);
             list = oldMesWorkOrders.stream().filter(workOrder ->!StringUtils.isEmpty(workOrder.getPlanStartTime()) && !StringUtils.isEmpty(workOrder.getPlanEndTime()) &&
-                    beginDate.getTime() >= transfer(workOrder.getPlanStartTime()).getTime()   &&  beginDate.getTime() <= transfer(workOrder.getPlanEndTime()).getTime()).collect(Collectors.toList());
+                    transfer(productionRecord.getCompleteDateTime()).getTime() >= transfer(workOrder.getPlanStartTime()).getTime()   &&  transfer(productionRecord.getCompleteDateTime()).getTime() <= transfer(workOrder.getPlanEndTime()).getTime()).collect(Collectors.toList());
 
         }
         workOrders = list;