From 7abf8942d941e0b50c29db7b9e7818b3333a7e87 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 06 十二月 2024 09:57:57 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java index 30ce97c..1e53034 100644 --- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java @@ -63,7 +63,7 @@ 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); @@ -81,20 +81,17 @@ .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); - - 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("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response); - }finally { + } finally { apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms" , wmsUrl + TaskExecCallback , null -- Gitblit v1.9.1