From 19d3488298119d50a94a54903623bf0088d3359c Mon Sep 17 00:00:00 2001
From: 958836976@qq.com <958836976@qq.com>
Date: 星期一, 23 十二月 2024 22:30:08 +0800
Subject: [PATCH] 出库类型修改
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java | 25 ++++++++++++++++++-------
zy-asrs-wms/src/main/resources/application.yml | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/TaskStsType.java | 1 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java | 26 +++++++++-----------------
4 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
index d7f4602..f4c88e5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java
@@ -166,18 +166,23 @@
/**
- * 鍑哄簱浠诲姟--- 姣忛殧3绉掞紝鑾峰彇褰撳墠鍑哄簱浠诲姟鍒楄〃鐘舵�佷负WCS_EXECUTE_OUT_TASK_DONE鐨勪换鍔★紝骞堕�氱煡ESS娴佸姩杈撻�佺嚎
+ * 鍑哄簱浠诲姟--- 姣忛殧3绉掞紝鑾峰彇褰撳墠鍑哄簱浠诲姟鍒楄〃鐘舵�佷负WCS_EXECUTE_OUT_ARRIVED鐨勪换鍔★紝骞堕�氱煡ESS娴佸姩杈撻�佺嚎
* */
// @Scheduled(cron = "0/3 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void conveyorToNotify() {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id).eq(Task::getStatus, 0));
+ .eq(Task::getTaskSts, TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id).eq(Task::getStatus, 0));
tasks.forEach(task -> {
try {
ConveyorStarParam conveyorStarParam = new ConveyorStarParam();
conveyorStarParam.setSlotCode(task.getOriginLoc())
.setContainerCode(task.getBarcode());
+ if (task.getTaskType() == 101) { //浠诲姟绫诲瀷涓�101鍏ㄧ洏鍑哄簱锛岀洿鎺ュ彇涓嬪鍣紝浼�200
+ conveyorStarParam.setDirection("200");
+ } else if (task.getTaskType() == 103) { //濡傛灉涓轰换鍔＄被鍨嬩负103锛岄渶璧板洖搴撴搷浣滐紝浼�100
+ conveyorStarParam.setDirection("100");
+ }
//璋冪敤涓夋柟鎺ュ彛锛屽皢浠诲姟鎺ㄩ�佽嚦ESS骞冲彴
MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
// 璁剧疆璇锋眰鍙傛暟
@@ -195,9 +200,16 @@
CommonReponse commonReponse = JSON.toJavaObject(JSON.parseObject(exchange.getBody()), CommonReponse.class);
if (commonReponse.getCode() == 0) {
//娴佸姩閫氱煡涓嬪彂瀹屾垚鍚庯紝淇敼浠诲姟鐘舵�佷负杈撻�佺嚎娴佸姩涓�傘��
- taskService.update(new LambdaUpdateWrapper<Task>()
- .eq(Task::getId, task.getId())
- .set(Task::getTaskType, TaskStsType.WCS_EXECUTE_OUT_CONVEYOR.id));
+ if (task.getTaskType() == 101) {
+ taskService.update(new LambdaUpdateWrapper<Task>()
+ .eq(Task::getId, task.getId())
+ .set(Task::getTaskType, TaskStsType.COMPLETE_OUT.id));
+ } else {
+ taskService.update(new LambdaUpdateWrapper<Task>()
+ .eq(Task::getId, task.getId())
+ .set(Task::getTaskType, TaskStsType.WCS_EXECUTE_OUT_CONVEYOR.id));
+ }
+
log.info(task.getTaskNo() + "涓嬪彂娴佸姩閫氱煡" + commonReponse.getMsg());
} else {
throw new CoolException("涓嬪彂娴佸姩閫氱煡澶辫触锛侊紒");
@@ -221,7 +233,7 @@
* //TODO 1. 姝ｅ父鍑哄簱鍚庯紝娓呴櫎浠诲姟锛�
* //TODO 2. 鍑哄簱鍚庤繕鏈夊簱瀛橈紝闇�瑕佹坊鍔犲鍣ㄥ洖搴撴搷浣�
*/
- // @Scheduled(cron = "0/3 * * * * ? ")
+ //@Scheduled(cron = "0/3 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void waveToTask() {
//鑾峰彇褰撳墠浠诲姟妗ｄ腑锛屾墍鏈変负寰呭嚭搴撶姸鎬佺殑浠诲姟妗ｏ紝鎸夋椂闂村崌搴忔帓鍒�
@@ -280,6 +292,5 @@
throw new CoolException(reponse.getMsg());
}
}
-
}
}
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..07fcfd6 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
@@ -75,21 +75,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType) {
- Long type = 1L;
- if (stockType.equals("outStock")) { //鍑哄簱浠诲姟
- type = 101L;
- }
+ Long type = 100L;
List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
.eq(Task::getBarcode, callbackParam.getContainerCode())
- .eq(Task::getTaskType, type)
+ .ge(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_CONTAINER_RECEIVE.id) {
taskStsType = TaskStsType.WCS_TOTE_LOAD;
} else {
String errMsg = "浠诲姟缂栧彿锛�" + task.getTaskNo() + "鐘舵�佷负涓嶅尮閰嶏紝" + "涓嶈兘鎵ц锛�" + TaskStsType.WCS_TOTE_LOAD.desc + "浠诲姟";
@@ -97,7 +93,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 +101,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 +116,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 +123,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 +132,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 +140,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 +156,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());
-// }
}
});
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/TaskStsType.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/TaskStsType.java
index e3c42c1..a875b74 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/TaskStsType.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/enums/TaskStsType.java
@@ -21,6 +21,7 @@
WCS_PUTAWAY_SUSPEND(13L, "鍏ュ簱浠诲姟鎸傝捣"),
COMPLETE_IN(99L, "鍏ュ簱瀹屾垚"),
+
UPDATED_IN(100L, "搴撳瓨鏇存柊瀹屾垚"),
GENERATE_OUT(101L, "鐢熸垚鍑哄簱浠诲姟"),
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 3d6614a..c88d170 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -37,7 +37,7 @@
# global-config:
# field-strategy: 0
configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
global-config:
--
Gitblit v1.9.1