一件排产

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -392,7 +392,8 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
             Operation operation = it.next().getValue();
             for(TTask task : taskList){
                 if(task.getTmpId().equals(operation.getId())){
-                    List<BomProcedureProductionresource> procedureProductionresourceList = procedureProductionresourceMapper.selectList(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,task.getProcedureId()).eq(BomProcedureProductionresource::getResourceId,operation.getMachineId()));
+                    List<BomProcedureProductionresource> procedureProductionresourceList = procedureProductionresourceMapper.selectList(Wraps.<BomProcedureProductionresource>lbQ().eq(BomProcedureProductionresource::getProcedureId,task.getProcedureId())
+                            .eq(BomProcedureProductionresource::getResourceId,operation.getMachineId()).orderByDesc(BomProcedureProductionresource::getCreateTime));
                     task.setExpectStartTime(new Date(operation.getStart()));
                     task.setExpectEndTime(new Date(operation.getFinish()));
                     task.setResourceId(operation.getMachineId());