root/shanghaikaineng_lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev：mes查看任务加条件

Browse Source
This commit is contained in:
liuxy
2025-02-25 14:53:26 +08:00
parent 9925c64446
commit 2b8d4af7f2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
View File

@@ -166,10 +166,12 @@ public class LampThreecolorDeviceDriver extends AbstractOpcDeviceDriver implemen
String[] carArr = {dataList.get(0).getString("id")}; String[] carArr = {dataList.get(0).getString("id")};
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("vehicles", carArr); json.put("vehicles", carArr);
// 请求下发agv急停 if (ObjectUtil.isNotEmpty(carArr)) {
XianGongAgvServiceImpl xianGongAgv = SpringContextHolder.getBean(XianGongAgvServiceImpl.class); // 请求下发agv急停
//创建订单序列 XianGongAgvServiceImpl xianGongAgv = SpringContextHolder.getBean(XianGongAgvServiceImpl.class);
xianGongAgv.sendOrderStopToXZ(json); //创建订单序列
xianGongAgv.sendOrderStopToXZ(json);
}
} }
} }

1
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java
View File

@@ -171,6 +171,7 @@ public class MesToWmsServiceImpl implements MesToWmsService {
List<SchBaseTask> taskList = taskService.list( List<SchBaseTask> taskList = taskService.list(
new QueryWrapper<SchBaseTask>().lambda() new QueryWrapper<SchBaseTask>().lambda()
.eq(SchBaseTask::getIs_delete, RegionEnum.IS_NOTANDYES.code("否")) .eq(SchBaseTask::getIs_delete, RegionEnum.IS_NOTANDYES.code("否"))
.lt(SchBaseTask::getTask_status, TaskStatus.FINISHED.getCode())
); );
// 处理需返回数据 // 处理需返回数据