From 2b8d4af7f274fa69ce56a61a7b7538beb52c5c9d Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 25 Feb 2025 14:53:26 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9Ames=E6=9F=A5=E7=9C=8B=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8A=A0=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lamp_three_color/LampThreecolorDeviceDriver.java | 10 ++++++---- .../wms/ext/mes/service/impl/MesToWmsServiceImpl.java | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) 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 taskList = taskService.list( new QueryWrapper().lambda() .eq(SchBaseTask::getIs_delete, RegionEnum.IS_NOTANDYES.code("否")) + .lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode()) ); // 处理需返回数据