Browse Source

rev:mes查看任务加条件

master
刘先源 1 month ago
parent
commit
2b8d4af7f2
  1. 2
      acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java
  2. 1
      lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java

2
acs2/nladmin-system/src/main/java/org/nl/acs/device_driver/lamp_three_color/LampThreecolorDeviceDriver.java

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

1
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())
);
// 处理需返回数据

Loading…
Cancel
Save