diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
index 3e744cf..497d658 100644
--- a/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
+++ b/acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
@@ -166,10 +166,12 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen
                 String[] carArr = {dataList.get(0).getString("id")};
                 JSONObject json = new JSONObject();
                 json.put("vehicles", carArr);
-                // 请求下发agv急停
-                XianGongAgvServiceImpl xianGongAgv = SpringContextHolder.getBean(XianGongAgvServiceImpl.class);
-                //创建订单序列
-                xianGongAgv.sendOrderStopToXZ(json);
+                if (ObjectUtil.isNotEmpty(carArr)) {
+                    // 请求下发agv急停
+                    XianGongAgvServiceImpl xianGongAgv = SpringContextHolder.getBean(XianGongAgvServiceImpl.class);
+                    //创建订单序列
+                    xianGongAgv.sendOrderStopToXZ(json);
+                }
             }
 
         }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java
index d23dc90..02df335 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java
@@ -171,6 +171,7 @@ public class MesToWmsServiceImpl implements MesToWmsService {
         List<SchBaseTask> taskList = taskService.list(
                 new QueryWrapper<SchBaseTask>().lambda()
                         .eq(SchBaseTask::getIs_delete, RegionEnum.IS_NOTANDYES.code("否"))
+                        .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
         );
 
         // 处理需返回数据