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("指令正在执行中,操作失败!");
}

2
lms/nladmin-system/src/main/java/org/nl/modules/system/rest/MonitorController.java
View File

@@ -40,7 +40,7 @@ public class MonitorController {
@GetMapping
@ApiOperation("查询服务监控")
@SaCheckPermission("monitor:list")
// @SaCheckPermission("monitor:list")
public ResponseEntity<Object> query() {
return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK);
}

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CallEmptyVehicleTask.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.sch.task;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -11,6 +12,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.base.point.LockType;
import org.nl.wms.sch.base.point.PointStatus;
import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -21,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* 纽迪希亚3叫空载具任务
@@ -152,6 +156,15 @@ public class CallEmptyVehicleTask extends AbstractAcsTask {
throw new BadRequestException("已完成的任务不能取消");
}
if (StrUtil.equals(task.getString("task_status"), TaskStatus.ISSUE.getCode())) {
JSONArray cancelTaskArr = new JSONArray();
cancelTaskArr.add(task);
Map<String, Object> acsResult = SpringContextHolder.getBean(WmsToAcsService.class).cancelToAcs(cancelTaskArr);
if (!MapUtil.getStr(acsResult, "status").equals("200")) {
throw new BadRequestException(MapUtil.getStr(acsResult, "message"));
}
}
taskTable.delete(task);
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");

14
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CallMaterialTask.java
View File

@@ -1,14 +1,18 @@
package org.nl.wms.sch.task;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.base.point.LockType;
import org.nl.wms.sch.base.point.PointStatus;
import org.nl.wms.sch.base.point.PointType;
@@ -20,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* 纽迪希亚3呼叫原料出库任务
@@ -163,6 +168,15 @@ public class CallMaterialTask extends AbstractAcsTask {
throw new BadRequestException("已完成的任务不能取消");
}
if (StrUtil.equals(task.getString("task_status"), TaskStatus.ISSUE.getCode())) {
JSONArray cancelTaskArr = new JSONArray();
cancelTaskArr.add(task);
Map<String, Object> acsResult = SpringContextHolder.getBean(WmsToAcsService.class).cancelToAcs(cancelTaskArr);
if (!MapUtil.getStr(acsResult, "status").equals("200")) {
throw new BadRequestException(MapUtil.getStr(acsResult, "message"));
}
}
taskTable.delete(task);
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/SendEmptyVehicleTask.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.sch.task;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -11,6 +12,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.base.point.LockType;
import org.nl.wms.sch.base.point.PointStatus;
import org.nl.wms.sch.manage.AbstractAcsTask;
@@ -21,6 +24,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* 纽迪希亚3呼叫空车入库
@@ -154,6 +158,15 @@ public class SendEmptyVehicleTask extends AbstractAcsTask {
throw new BadRequestException("已完成的任务不能取消");
}
if (StrUtil.equals(task.getString("task_status"), TaskStatus.ISSUE.getCode())) {
JSONArray cancelTaskArr = new JSONArray();
cancelTaskArr.add(task);
Map<String, Object> acsResult = SpringContextHolder.getBean(WmsToAcsService.class).cancelToAcs(cancelTaskArr);
if (!MapUtil.getStr(acsResult, "status").equals("200")) {
throw new BadRequestException(MapUtil.getStr(acsResult, "message"));
}
}
taskTable.delete(task);
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/SendFullVehicleTask.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.sch.task;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -11,6 +12,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.base.point.LockType;
import org.nl.wms.sch.base.point.PointStatus;
import org.nl.wms.sch.base.point.PointType;
@@ -22,6 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* 纽迪希亚3送满料车任务
@@ -155,6 +159,15 @@ public class SendFullVehicleTask extends AbstractAcsTask {
throw new BadRequestException("已完成的任务不能取消");
}
if (StrUtil.equals(task.getString("task_status"), TaskStatus.ISSUE.getCode())) {
JSONArray cancelTaskArr = new JSONArray();
cancelTaskArr.add(task);
Map<String, Object> acsResult = SpringContextHolder.getBean(WmsToAcsService.class).cancelToAcs(cancelTaskArr);
if (!MapUtil.getStr(acsResult, "status").equals("200")) {
throw new BadRequestException(MapUtil.getStr(acsResult, "message"));
}
}
taskTable.delete(task);
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");

13
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/SendResiduesMaterialTask.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.sch.task;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -11,6 +12,8 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.base.point.LockType;
import org.nl.wms.sch.base.point.PointStatus;
import org.nl.wms.sch.base.point.PointType;
@@ -22,6 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
/**
* 纽迪西亚3呼叫余料入库任务
@@ -155,6 +159,15 @@ public class SendResiduesMaterialTask extends AbstractAcsTask {
throw new BadRequestException("已完成的任务不能取消");
}
if (StrUtil.equals(task.getString("task_status"), TaskStatus.ISSUE.getCode())) {
JSONArray cancelTaskArr = new JSONArray();
cancelTaskArr.add(task);
Map<String, Object> acsResult = SpringContextHolder.getBean(WmsToAcsService.class).cancelToAcs(cancelTaskArr);
if (!MapUtil.getStr(acsResult, "status").equals("200")) {
throw new BadRequestException(MapUtil.getStr(acsResult, "message"));
}
}
taskTable.delete(task);
WQLObject pointTable = WQLObject.getWQLObject("sch_base_point");

4
lms/nladmin-ui/src/views/login.vue
View File

@@ -56,8 +56,8 @@ export default {
codeUrl: '',
cookiePass: '',
loginForm: {
username: 'admin',
password: '123456',
username: '',
password: '',
rememberMe: false,
code: '',
uuid: ''