diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java index 90b9daf..f734f1e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java @@ -4,7 +4,7 @@ package com.ruoyi.common; public class Constant { public static final String LOCAL_URL = "http://127.0.0.1:8084"; - public static final String WMS_BASE_URL = "http://10.88.10.69:8290/service"; + public static final String WMS_BASE_URL = "http://10.88.10.69:8390/service"; public static final String RCS_BASE_URL = "http://192.168.58.101:8182/rcms/services/rest/hikRpcService/"; public static final String HEADER_TOKEN = "fed3d1511a5a474b9e1f9c56246cb1ec"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java index 689ec7a..7793407 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java @@ -132,6 +132,14 @@ public class MydoJobController extends BaseController return mydoJobService.outhandFinish(jobIds); } + @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:cancelJob')") + @Log(title = "出库作废", businessType = BusinessType.OTHER) + @RequestMapping("/cancelJob") + public AjaxResult cancelJob(@RequestParam("jobIds")String[] jobIds) + { + return toAjax(mydoJobService.deleteMydoJobByJobIds(jobIds)); + } + @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:resendTaskToEntrance')") @Log(title = "入口输送机重新下发", businessType = BusinessType.OTHER) @PutMapping("/resendTaskToEntrance") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java index 3af9b2c..827c2b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java @@ -107,20 +107,23 @@ public class MydoJobServiceImpl implements IMydoJobService public int deleteMydoJobByJobIds(String[] jobIds) { for (String jobId : jobIds) { - - if (selectMydoJobByJobId(jobId) == null) continue; MydoJob mydoJob = selectMydoJobByJobId(jobId); - selectMydoJobByJobId(jobId).setStatus(TASK_STATUS_INVALID); + + if (mydoJob == null) continue; + mydoJob.setStatus(TASK_STATUS_INVALID); updateMydoJob(mydoJob); mydoJobMapper.insertHistory(jobId); + deleteMydoJobByJobId(jobId); //当执行任务的【删除】操作时（特殊场景需要手动处理异常导致不需要入库时，此时不需要向回传异常） // 此处顺便处理对应任务号生成的堆垛机执行队列，省去sql直接表中删记录的操作 - String taskNo = selectMydoJobByJobId(jobId).getTaskNo(); - if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(taskNo) != null) { - ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo); + DdjDeviceExecutionQueue queue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo()); + if (queue != null){ + ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo()); } + log.info("【人工操作】执行手动删除作业，作业号：{}", jobId); + } return mydoJobMapper.deleteMydoJobByJobIds(jobIds); } @@ -134,6 +137,26 @@ public class MydoJobServiceImpl implements IMydoJobService @Override public int deleteMydoJobByJobId(String jobId) { + try{ + MydoJob mydoJob = selectMydoJobByJobId(jobId); + if (mydoJob == null) return 0; + + mydoJob.setStatus(TASK_STATUS_INVALID); + updateMydoJob(mydoJob); + mydoJobMapper.insertHistory(jobId); + + //当执行任务的【删除】操作时（特殊场景需要手动处理异常导致不需要入库时，此时不需要向回传异常） + // 此处顺便处理对应任务号生成的堆垛机执行队列，省去sql直接表中删记录的操作 + String taskNo = selectMydoJobByJobId(jobId).getTaskNo(); + if (taskNo != null || taskNo != "") { + ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo); + } + + log.info("【人工操作】执行手动删除作业，作业号：{}", jobId); + }catch (Exception e){ + log.warn("【提示】操作失败，发生了未知错误：{}", e.getMessage()); + } + return mydoJobMapper.deleteMydoJobByJobId(jobId); } diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 40cbe21..2a333b0 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -14,7 +14,7 @@ spring: # 本机 url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT568-wcs;encrypt=true;trustServerCertificate=true; username: sa - password: 123456 + password: Aa123456 # 生产 # url: jdbc:sqlserver://192.168.58.10:1433;databaseName=FT568-wcs;encrypt=true;trustServerCertificate=true; diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index 2f3f460..e767c32 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -5,9 +5,6 @@ - - - @@ -27,7 +24,7 @@ ${log.pattern} - ${log.charset} + UTF-8 @@ -50,7 +47,7 @@ ${log.pattern} - ${log.charset} + UTF-8 @@ -73,7 +70,7 @@ ${log.pattern} - ${log.charset} + UTF-8 diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index f917aab..1b097bb 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and wms_task_no = #{wmsTaskNo} - ORDER BY create_time DESC,finish_time DESC + ORDER BY create_time DESC,finish_time DESC;