From 32afdc40d71b62ed0a2e0693cd56564816b188e5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 26 十二月 2024 17:30:57 +0800
Subject: [PATCH] #添加HOST权限，如果授权为空，默认1
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
index 1113821..e59287e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -63,10 +63,11 @@
.set(Task::getOriginLoc, arrivedParam.getSlotCode())
.eq(Task::getBarcode, arrivedParam.getContainerCode()));
} else {
- taskService.update(new LambdaUpdateWrapper<Task>()
+ boolean update = taskService.update(new LambdaUpdateWrapper<Task>()
.set(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id)
.set(Task::getOriginLoc, arrivedParam.getSlotCode())
.eq(Task::getBarcode, arrivedParam.getContainerCode()));
+
}
return R.success("success");
@@ -75,21 +76,15 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType) {
- Long type = 1L;
- if (stockType.equals("outStock")) { //鍑哄簱浠诲姟
- type = 101L;
- }
List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
.eq(Task::getBarcode, callbackParam.getContainerCode())
- .eq(Task::getTaskType, type)
.eq(Task::getTaskNo, callbackParam.getTaskCode()));
if (!Collections.isEmpty(list)) {
- Long finalType = type;
list.forEach(task -> {
TaskStsType taskStsType = null;
if (stockType.equals("inStock")) { //鍏ュ簱浠诲姟
if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
- if (task.getTaskType() == TaskStsType.WCS_CONTAINER_RECEIVE.id) {
+ if (task.getTaskSts() == TaskStsType.WCS_CONVEYOR_START.id) {
taskStsType = TaskStsType.WCS_TOTE_LOAD;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_LOAD.desc + "浠诲姟";
@@ -97,7 +92,7 @@
throw new CoolException(errMsg);
}
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //涓婃姤鏀剧鐘舵��
- if (task.getTaskType() == TaskStsType.WCS_TOTE_LOAD.id) {
+ if (task.getTaskSts() == TaskStsType.WCS_TOTE_LOAD.id) {
taskStsType = TaskStsType.WCS_TOTE_UNLOAD;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_UNLOAD.desc + "浠诲姟";
@@ -105,7 +100,7 @@
throw new CoolException(errMsg);
}
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //TODO 闇�纭涓婃姤浠诲姟涓紝浠诲姟瀹屾垚鏄摢涓簨浠讹紝鐩墠鏆傚畾task浜嬩欢
- if (task.getTaskType() == TaskStsType.WCS_TOTE_UNLOAD.id) {
+ if (task.getTaskSts() == TaskStsType.WCS_TOTE_UNLOAD.id) {
taskStsType = TaskStsType.WCS_PUTAWAY_SUCESS;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_PUTAWAY_SUCESS.desc + "浠诲姟";
@@ -120,7 +115,6 @@
.set(Task::getExcudeStatus, callbackParam.getStatus())
.set(Task::getTaskDesc, callbackParam.getMessage())
.eq(Task::getBarcode, callbackParam.getContainerCode())
- .eq(Task::getTaskType, finalType)
.eq(Task::getTaskNo, callbackParam.getTaskCode()));
if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event) && result) {
@@ -128,7 +122,8 @@
}
} else { //鍑哄簱浠诲姟
if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
- if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT.id) {
+ //TODO 瀹氭椂鍣ㄥ紑鍚悗锛岃鍒犻櫎 || task.getTaskType() == TaskStsType.GENERATE_OUT.id
+ if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT.id || task.getTaskSts() == TaskStsType.GENERATE_OUT.id) {
taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.desc + "浠诲姟";
@@ -136,7 +131,7 @@
throw new CoolException(errMsg);
}
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //涓婃姤鏀剧鐘舵��
- if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {
+ if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {
taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.desc + "浠诲姟";
@@ -144,7 +139,7 @@
throw new CoolException(errMsg);
}
} else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //涓婃姤瀹屾垚鐘舵��
- if (task.getTaskType() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id) {
+ if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id) {
taskStsType = TaskStsType.WCS_EXECUTE_OUT_TASK_DONE;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.desc + "浠诲姟";
@@ -160,13 +155,9 @@
.set(Task::getTaskSts, taskStsType.id)
.set(Task::getExcudeStatus, callbackParam.getStatus())
.set(Task::getTaskDesc, callbackParam.getMessage())
- .eq(Task::getTaskType, finalType)
.eq(Task::getBarcode, callbackParam.getContainerCode())
.eq(Task::getTaskNo, callbackParam.getTaskCode()));
-// if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event) && result) {
-//// workService.completeTask(task.getId());
-// }
}
});
--
Gitblit v1.9.1