diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
index 4db191c..19b134e 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
@@ -287,7 +287,7 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
             );
             e.setCustomers(customers);
             e.setKilnName(e.getTargetPosition());
-            e.setLocationName(locationServiceBiz.getById(e.getLocationId()).getLocationName());
+            //e.setLocationName(locationServiceBiz.getById(e.getLocationId()).getLocationName());
         });
         return successful(pageVo);
     }
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
index 2d3bc2c..8b9abc4 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java
@@ -217,7 +217,7 @@ public class ScheduledTask extends BaseService {
                     asynRunTaskService.asynEndRecordConsume(currTask.getId(),kilnId);
                     logger.info(kilnInfo.getCode()+"炉子中的任务："+currTask.getId()+"已加工结束，记录加工结束能源消耗值");
                     //更新加工单工艺结束时间,只更新一次，因为可能因为不满住出炉条件而进入到下一次定时任务
-                    if (StringUtils.isBlank(currTask.getEndTime().toString())){
+                    if (String.valueOf(currTask.getEndTime()).equals("null")){
                         currTask.setEndTime(LocalDateTime.now());
                         currTaskServiceBiz.updateById(currTask);
                     }