From 04a3dc92f15bbcaaadbca0f2e6b8fb1dcd31e338 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 06 三月 2025 13:45:30 +0800
Subject: [PATCH] 堆垛机移库任务下发坐标修改

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 9c371ff..c1909b4 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -63,12 +63,13 @@
 
         for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
             HashMap<String, Object> headParam = new HashMap<>();
-            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚
+            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
                 headParam.put("Result", 1);
             } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
                 headParam.put("Result", 2);
             }
             String response = "";
+            Boolean bool = false;
             try {
                 headParam.put("TaskNo", taskWrk.getTaskNo());
                 log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
@@ -80,17 +81,18 @@
                         .build()
                         .doPost();
                 JSONObject jsonObject = JSON.parseObject(response);
-                Boolean bool = false;
-                if(jsonObject.get("ReturnStatus").equals(0)){
-                    TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
-                    if(!wrkLogService.insert(taskWrkLog)){
-                        throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
-                    }
-                    if(!taskWrkService.deleteById(taskWrk)){
-                        throw new CoolException("浠诲姟妗e垹闄ゅけ璐�"+taskWrkLog);
-                    }
-                    bool = true;
+                TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+                if (!wrkLogService.insert(taskWrkLog)) {
+                    throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
                 }
+                if (!taskWrkService.deleteById(taskWrk)) {
+                    throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
+                }
+                bool = true;
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+            } finally {
                 apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
                         , wmsUrl + TaskExecCallback
                         , null
@@ -99,10 +101,7 @@
                         , response
                         , bool
                 );
-            } catch (Exception e) {
-                log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
             }
-
         }
     }
 

--
Gitblit v1.9.1