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

LMS 取消任务同时取消 ACS 任务

Browse Source
This commit is contained in:
张江玮
2022-11-24 09:42:12 +08:00
parent bfe3ae4261
commit e2d2f3086d
8 changed files with 80 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -188,24 +188,31 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
log.info("cancelFromWms--------------:输入参数" + tasks.toString());
for (int i = 0; i < tasks.size(); i++) {
JSONObject task = tasks.getJSONObject(i);
String task_uuid = task.getString("task_id");
String wmsTaskId = task.getString("task_id");
String task_code = task.getString("task_code");
String vehicle_code = task.getString("vehicle_code");
String params = task.getString("params");
if (StrUtil.isEmpty(task_uuid)) {
if (StrUtil.isEmpty(wmsTaskId)) {
throw new WDKException("任务标识不能为空");
}
if (StrUtil.isEmpty(task_code)) {
throw new WDKException("任务号不能为空");
}
String acsTaskId = WQLObject
.getWQLObject("acs_task")
.query("ext_task_id = '" + wmsTaskId + "'")
.uniqueResult(0)
.getString("task_id");
String cancelTaskCheck = paramService.findByCode(AcsConfig.CANCELTASKCHECK).getValue();
if (StrUtil.equals(cancelTaskCheck, "1")) {
taskService.cancel(task_uuid);
taskService.cancel(acsTaskId);
} else if (StrUtil.equals(cancelTaskCheck, "0")) {
Instruction inst = instructionService.findByTaskcode(task_code);
if (inst == null) {
taskService.cancel(task_uuid);
taskService.cancel(acsTaskId);
} else {
throw new RuntimeException("指令正在执行中,操作失败!");
}