From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 25 十二月 2024 17:13:34 +0800
Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后,状态修改补上 4. 修改状态时,需校验上一步状态是否对应 5. 下发任务完成后,查看是否修改状态为2 7. 任务状态列表,数据显示不全问题修复 8. 波次列表,表格合并问题导致多订单出库问题

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 07fcfd6..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,17 +76,15 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void receiveTaskStatus(TasksStatusCallbackParam callbackParam, String stockType) {
-        Long type = 100L;
         List<Task> list = taskService.list(new LambdaQueryWrapper<Task>()
                 .eq(Task::getBarcode, callbackParam.getContainerCode())
-                .ge(Task::getTaskType, type)
                 .eq(Task::getTaskNo, callbackParam.getTaskCode()));
         if (!Collections.isEmpty(list)) {
             list.forEach(task -> {
                     TaskStsType taskStsType = null;
                     if (stockType.equals("inStock")) { //鍏ュ簱浠诲姟
                         if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //涓婃姤鍙栫鐘舵��
-                            if (task.getTaskSts() == 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 + "浠诲姟";

--
Gitblit v1.9.1