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

add:增加近期的一些新增需求实现；

Browse Source
This commit is contained in:
gongbaoxiong
2026-07-13 17:52:14 +08:00
parent 343d183c56
commit 09d723e846
14 changed files with 98 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -1011,7 +1011,7 @@ export default {
if (isStartTask) {
const prefix = startDeviceCode.split('-')[0]
this.$confirm(
'检测该任务起点【' + prefix + '】的同一排存在多个任务，是否一起修改优先级？',
'检测到该任务起点【' + prefix + '】为特殊分配区域，如果存在同排入库任务，是否需要一起修改优先级防止取货阻挡？',
'提示',
{ confirmButtonText: '是，一起修改', cancelButtonText: '否，仅修改当前', type: 'warning' }
).then(() => {

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
View File

@@ -657,7 +657,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
//有效库位列表
structCodeList = validStructCodeList;
List<String> allStructList = new ArrayList<>();
allStructList.addAll(structCodeList);
// allStructList.addAll(structCodeList);
allStructList.addAll(remarkCodeList);
LambdaUpdateWrapper<Structattr> updateWrapper = new LambdaUpdateWrapper<>();
//不符合设置超托的库位集合
@@ -691,6 +691,8 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
.map(Structattr::getStruct_code)
.collect(Collectors.toList()));
allStructList.removeAll(codesToRemove);
}else {
allStructList.addAll(structCodeList);
}
}else{
msg = "操作失败,检查库位是否有货或被锁住!";

11
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/BackInTask.java
View File

@@ -18,6 +18,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,7 +40,8 @@ public class BackInTask extends AbstractTask {
*/
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private ISysParamService iSysParamService;
/**
* 点位服务
*/
@@ -121,14 +125,15 @@ public class BackInTask extends AbstractTask {
@Override
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);
this.cancelTask(taskObj);
}
@Override

8
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckBackMoveTask.java
View File

@@ -21,6 +21,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSConstant;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.service.IMdPbGroupplateService;
@@ -59,6 +62,8 @@ public class CheckBackMoveTask extends AbstractTask {
*/
@Autowired
private IStructattrService iStructattrService;
@Autowired
private ISysParamService iSysParamService;
/**
* 点位服务
@@ -165,11 +170,12 @@ public class CheckBackMoveTask extends AbstractTask {
@Override
@Transactional
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);

8
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckInTask.java
View File

@@ -19,6 +19,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.service.dao.StIvtCheckdtl;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,8 @@ public class CheckInTask extends AbstractTask {
*/
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private ISysParamService iSysParamService;
/**
* 仓位服务
@@ -143,11 +148,12 @@ public class CheckInTask extends AbstractTask {
@Override
@Transactional
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);

13
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckMoveTask.java
View File

@@ -20,6 +20,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSConstant;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.service.IStIvtCheckdtlService;
@@ -33,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
@TaskType("CheckMoveTask")
public class CheckMoveTask extends AbstractTask {
@Autowired
private ISysParamService iSysParamService;
/**
* 任务服务类
@@ -40,6 +45,7 @@ public class CheckMoveTask extends AbstractTask {
@Autowired
private ISchBaseTaskService taskService;
/**
* 仓位服务
*/
@@ -143,10 +149,14 @@ public class CheckMoveTask extends AbstractTask {
@Override
@Transactional
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);
}
@Transactional
@@ -189,9 +199,6 @@ public class CheckMoveTask extends AbstractTask {
}
@Transactional
public void cancelTask(SchBaseTask taskObj) {
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
// 更新盘点明细状态
iStIvtCheckdtlService.update(
new UpdateWrapper<StIvtCheckdtl>().lambda()

12
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/CheckOutTask.java
View File

@@ -18,6 +18,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +33,8 @@ public class CheckOutTask extends AbstractTask {
*/
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private ISysParamService iSysParamService;
/**
* 仓位服务
@@ -140,17 +145,18 @@ public class CheckOutTask extends AbstractTask {
@Override
@Transactional
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);
}
@Transactional
public void cancelTask(SchBaseTask taskObj) {
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
// 更新任务状态
taskObj.setRemark("已取消");
taskObj.setTask_status(TaskStatus.CANCELED.getCode());

9
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/MoveTask.java
View File

@@ -14,6 +14,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.service.IStIvtMoveinvService;
import org.nl.wms.warehouse_manage.service.IStIvtMoveinvdtlService;
import org.nl.wms.warehouse_manage.service.dao.StIvtMoveinvdtl;
@@ -30,6 +33,9 @@ import org.springframework.transaction.annotation.Transactional;
@TaskType("MoveTask")
public class MoveTask extends AbstractTask {
@Autowired
private ISysParamService iSysParamService;
/**
* 任务服务类
*/
@@ -120,11 +126,12 @@ public class MoveTask extends AbstractTask {
@Override
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);

8
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/PdaPointTask.java
View File

@@ -19,6 +19,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -38,6 +41,8 @@ public class PdaPointTask extends AbstractTask {
*/
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private ISysParamService iSysParamService;
/**
* 点位服务
@@ -122,11 +127,12 @@ public class PdaPointTask extends AbstractTask {
@Override
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);

16
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StInTask.java
View File

@@ -18,6 +18,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.inAndOut.service.IInBillService;
import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis;
@@ -57,6 +60,8 @@ public class StInTask extends AbstractTask {
private IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService;
@Autowired
private MdPbStoragevehicleinfoMapper mdPbStoragevehicleinfoMapper;
@Autowired
private ISysParamService iSysParamService;
@Override
public String create(JSONObject json) {
@@ -141,15 +146,15 @@ public class StInTask extends AbstractTask {
@Override
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
// if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) {
// throw new BadRequestException("任务状态必须为生成才能取消任务");
// }
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);
}
@Override
@@ -167,9 +172,6 @@ public class StInTask extends AbstractTask {
@Transactional(rollbackFor = Exception.class)
public void cancelTask(SchBaseTask taskObj) {
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
rawAssistIStorService.taskCancel(taskObj);
//删除托盘和组盘
GroupPlate groupPlate=new GroupPlate();

16
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/StOutTask.java
View File

@@ -15,6 +15,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.inAndOut.service.IOutBillService;
import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis;
@@ -37,7 +40,8 @@ import javax.annotation.Resource;
public class StOutTask extends AbstractTask {
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private ISysParamService iSysParamService;
@Resource
private IOutBillService outBillService;
@@ -124,13 +128,14 @@ public class StOutTask extends AbstractTask {
@Override
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
// if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) {
// throw new BadRequestException("任务状态必须为生成才能取消任务");
// }
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);
}
@@ -149,9 +154,6 @@ public class StOutTask extends AbstractTask {
@Transactional(rollbackFor = Exception.class)
public void cancelTask(SchBaseTask taskObj) {
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
outBillService.taskCancel(taskObj);
// 取消任务
taskService.update(new LambdaUpdateWrapper<SchBaseTask>()

8
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleInTask.java
View File

@@ -18,6 +18,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -37,6 +40,8 @@ public class VehicleInTask extends AbstractTask {
*/
@Autowired
private ISchBaseTaskService taskService;
@Autowired
private ISysParamService iSysParamService;
/**
* 点位服务
@@ -120,11 +125,12 @@ public class VehicleInTask extends AbstractTask {
@Override
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);

13
nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java
View File

@@ -14,6 +14,9 @@ import org.nl.wms.sch_manage.service.dao.SchBaseTask;
import org.nl.wms.sch_manage.service.util.AbstractTask;
import org.nl.wms.sch_manage.service.util.AcsTaskDto;
import org.nl.wms.sch_manage.service.util.TaskType;
import org.nl.wms.system_manage.enums.SysParamConstant;
import org.nl.wms.system_manage.service.param.ISysParamService;
import org.nl.wms.system_manage.service.param.dao.Param;
import org.nl.wms.warehouse_manage.enums.IOSEnum;
import org.nl.wms.warehouse_manage.inAndOut.service.IOutBillService;
import org.nl.wms.warehouse_manage.inAndOut.service.dao.IOStorInvDis;
@@ -37,6 +40,8 @@ public class VehicleOutTask extends AbstractTask {
@Resource
private IOutBillService outBillService;
@Autowired
private ISysParamService iSysParamService;
@Resource
private IOStorInvDisMapper ioStorInvDisMapper;
@@ -115,12 +120,13 @@ public class VehicleOutTask extends AbstractTask {
@Override
public void cancel(String task_code) {
Param isConnectAcs = iSysParamService.findByCode(SysParamConstant.CHECK_TASK);
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
}
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())) {
throw new BadRequestException("任务状态必须为生成才能取消任务");
if (!TaskStatus.CREATE.getCode().equals(taskObj.getTask_status())&& "1".equals(isConnectAcs.getValue())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
this.cancelTask(taskObj);
}
@@ -140,9 +146,6 @@ public class VehicleOutTask extends AbstractTask {
@Transactional(rollbackFor = Exception.class)
public void cancelTask(SchBaseTask taskObj) {
if (Integer.parseInt(taskObj.getTask_status()) > Integer.parseInt(TaskStatus.CREATE.getCode())) {
throw new BadRequestException("只能取消生成状态的任务，该任务已下发ACS，请在ACS系统上取消。");
}
// 取消任务
taskService.update(new LambdaUpdateWrapper<SchBaseTask>()
.set(SchBaseTask::getIs_delete, BaseDataEnum.IS_YES_NOT.code("是"))

5
nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/SysParamConstant.java
View File

@@ -28,6 +28,11 @@ public class SysParamConstant {
*/
public final static String IS_CONNECT_ACS = "is_connect_acs";
/**
* 是否开启取消校验
*/
public final static String CHECK_TASK = "check_task";
/**
* ACS系统IP
*/