From cfd18236557c4218113c12ce1706e130764f008c Mon Sep 17 00:00:00 2001
From: youjie <272855983@qq.com>
Date: Tue, 6 Jun 2023 11:58:10 +0800
Subject: [PATCH] 更新下发任务代码
---
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java | 7 ++-----
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java | 11 ++++-------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
index 707403e..4590e31 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
@@ -289,7 +289,7 @@ public class WcsServiceImpl implements WcsService {
String toLocationCode = taskHeader.getToLocationCode();
Location fromLocation = locationService.getLocationByCode(fromLocationCode, warehouseCode);
// Location toLocation = locationService.getLocationByCode(toLocationCode, warehouseCode);
- boolean direction = true; // true 执行时是入库动作， false 执行时是出库动作
+ boolean direction = false; // true 执行时是入库动作， false 执行时是出库动作
switch (taskType) {
case QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT:
case QuantityConstant.TASK_TYPE_WHOLESHIPMENT:
@@ -299,9 +299,6 @@ public class WcsServiceImpl implements WcsService {
case QuantityConstant.TASK_TYPE_TRANSFER:
case QuantityConstant.TASK_TYPE_CHECK_OUT:
case QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT:
- if (fromLocation == null) {
- return Result.error("起始库位为空");
- }
direction = false;
break;
case QuantityConstant.TASK_TYPE_WHOLERECEIPT:
@@ -368,7 +365,7 @@ public class WcsServiceImpl implements WcsService {
}
}
- // 下发移库任务
+ // 下发任务
WcsTask wcsTask = new WcsTask();
wcsTask.setTaskNo(taskHeader.getId().toString());
wcsTask.setWarehouseCode(warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 4a527fa..67b80a3 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -948,22 +948,19 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
return Result.error("下发wcs任务时，没有找到任务, 任务号" + taskId);
}
if (taskHeader.getStatus() >= QuantityConstant.TASK_STATUS_RELEASE) {
- return Result.error("任务" + taskId + "已经下发，请不要重复下发，操作中止");
+ return Result.error("下发wcs任务时, 任务" + taskId + "已经下发，请不要重复下发，操作中止");
}
Result result = wcsService.wcsTaskAssign(taskHeader);
if (!result.isSuccess()) {
- if (result.getMessage().equals("先执行移库任务")) {
- return result;
- }
- throw new JeecgBootException(result.getMessage());
+ return Result.error(result.getMessage());
}
taskHeader.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
- boolean success = taskHeaderService.updateById(taskHeader);
+ boolean success = taskHeaderService.updateStatusById(QuantityConstant.TASK_STATUS_RELEASE, taskHeader.getId());
if (!success) {
throw new JeecgBootException("下发wcs任务时, 更新任务状态失败");
}
- return Result.ok("执行下发任务成功");
+ return Result.ok("下发wcs任务成功");
}
/**
--
libgit2 0.22.2