diff --git a/ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue b/ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue
index 58a43b4..34d64ad 100644
--- a/ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue
@@ -73,7 +73,6 @@ export default {
},
methods: {
-
add() {
this.edit(this.modelDefault);
},
diff --git a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
index c3a7e8d..2df3605 100644
--- a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
@@ -263,14 +263,9 @@ export default {
dataIndex: 'status_dictText',
},
{
- title: '是否重入',
+ title: '异常信息',
align: "center",
- dataIndex: 'isDoubleIn_dictText',
- },
- {
- title: '重入库位号',
- align: "center",
- dataIndex: 'originLocationCode'
+ dataIndex: 'exceptionName'
},
{
title: '创建人',
diff --git a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
index 689f8d8..77ef3d8 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
@@ -261,14 +261,9 @@ export default {
dataIndex: 'status_dictText',
},
{
- title: '重入',
+ title: '异常信息',
align: "center",
- dataIndex: 'isDoubleIn_dictText',
- },
- {
- title: '重入库位号',
- align: "center",
- dataIndex: 'originLocationCode'
+ dataIndex: 'exceptionName'
},
{
title: '创建人',
diff --git a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
index 864db8c..aa6e184 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
@@ -265,14 +265,9 @@ export default {
dataIndex: 'status_dictText',
},
{
- title: '空出',
+ title: '异常信息',
align: "center",
- dataIndex: 'isEmptyOut_dictText',
- },
- {
- title: '取货错',
- align: "center",
- dataIndex: 'isPickupError_dictText',
+ dataIndex: 'exceptionName'
},
{
title: '创建人',
diff --git a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
index 2fa9cde..9699ca6 100644
--- a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
@@ -270,14 +270,9 @@ export default {
dataIndex: 'status_dictText',
},
{
- title: '是否重入',
+ title: '异常信息',
align: "center",
- dataIndex: 'isDoubleIn_dictText',
- },
- {
- title: '重入库位号',
- align: "center",
- dataIndex: 'originLocationCode'
+ dataIndex: 'exceptionName'
},
{
title: '创建人',
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/IHuahengMultiHandlerService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/IHuahengMultiHandlerService.java
new file mode 100644
index 0000000..b6efdc9
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/IHuahengMultiHandlerService.java
@@ -0,0 +1,12 @@
+package org.jeecg.modules.wms.framework.service;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+
+/**
+ * @author 游杰
+ */
+public interface IHuahengMultiHandlerService {
+
+ Result sendTaskToWcs(TaskHeader taskHeader);
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
new file mode 100644
index 0000000..d3a91a1
--- /dev/null
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
@@ -0,0 +1,36 @@
+package org.jeecg.modules.wms.framework.service.impl;
+
+import javax.annotation.Resource;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
+import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
+import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 游杰
+ */
+@Service
+public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implements IHuahengMultiHandlerService {
+
+ @Resource
+ private ITaskHeaderService taskHeaderService;
+
+ @Override
+ public Result sendTaskToWcs(TaskHeader taskHeader) {
+ if (taskHeader == null) {
+ return Result.error("任务信息为空");
+ }
+ String lockKey = taskHeader.getWarehouseCode();
+ Result result = handleMultiProcess("sendTaskToWcs", lockKey, new MultiProcessListener() {
+ @Override
+ public Result<?> doProcess() {
+ Result result = taskHeaderService.sendTaskToWcs(taskHeader.getId());
+ return result;
+ }
+ });
+ return result;
+ }
+}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java
index e45c15b..4ce3a57 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/WcsTask.java
@@ -8,6 +8,7 @@ import javax.annotation.Resource;
import org.apache.commons.collections.MapUtils;
import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
import org.jeecg.modules.wms.task.taskHeader.service.ITaskHeaderService;
import org.jeecg.utils.constant.QuantityConstant;
@@ -22,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
/**
* 定时任务
+ * @author 游杰
*/
@Slf4j
@@ -31,6 +33,8 @@ public class WcsTask implements Job {
Map<String, Boolean> runningTaskMap = new HashMap<>();
@Resource
private ITaskHeaderService taskHeaderService;
+ @Resource
+ private IHuahengMultiHandlerService huahengMultiHandlerService;
@Override
public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -46,7 +50,7 @@ public class WcsTask implements Job {
List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
for (TaskHeader taskHeader : taskHeaderList) {
try {
- taskHeaderService.sendTaskToWcs(taskHeader.getId());
+ huahengMultiHandlerService.sendTaskToWcs(taskHeader);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
index 2e4c971..6ba858e 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
@@ -27,6 +27,7 @@ import org.jeecg.modules.wms.config.zone.entity.Zone;
import org.jeecg.modules.wms.config.zone.service.IZoneService;
import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
+import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail;
import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
import org.jeecg.modules.wms.task.taskHeader.service.ITaskDetailService;
@@ -81,6 +82,8 @@ public class TaskHeaderController extends HuahengBaseController {
private IPortService portService;
@Resource
private IZoneService zoneService;
+ @Resource
+ private IHuahengMultiHandlerService huahengMultiHandlerService;
/*---------------------------------主表处理-begin-------------------------------------*/
@@ -385,13 +388,7 @@ public class TaskHeaderController extends HuahengBaseController {
return Result.error("taskHeader不能为空");
}
Integer taskId = taskHeader.getId();
- Result result = handleMultiProcess("execute", new MultiProcessListener() {
- @Override
- public Result<?> doProcess() {
- Result result = taskHeaderService.sendTaskToWcs(taskId);
- return result;
- }
- });
+ Result result = huahengMultiHandlerService.sendTaskToWcs(taskHeader);
return result;
}