From 1b160b340bd6fe5f34cedbd01c80b9530d530d91 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 14 五月 2025 18:58:46 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 3e48136..e39709d 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -63,27 +63,13 @@
for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
HashMap<String, Object> headParam = new HashMap<>();
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚
- //鍖哄垎鍏ュ嚭搴�
- TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
- if (!wrkLogService.insert(taskWrkLog)) {
- throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
- }
- if (!taskWrkService.deleteById(taskWrk)) {
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
- }
+ if (taskWrk.getStatus().equals(TaskStatusType.OVER.id) || taskWrk.getStatus() == 7) {//瀹屾垚
headParam.put("Result", 1);
} else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
- if(!wrkLogService.insert(taskWrkLog)){
- throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
- }
- if(!taskWrkService.deleteById(taskWrk)){
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�"+taskWrkLog);
- }
headParam.put("Result", 2);
}
String response = "";
+ Boolean bool = false;
try {
headParam.put("TaskNo", taskWrk.getTaskNo());
log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
@@ -95,10 +81,21 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- Boolean bool = false;
- if(jsonObject.get("ReturnStatus").equals(0)){
+ if(jsonObject.getInteger("ReturnStatus")==0){
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + 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
@@ -107,10 +104,7 @@
, response
, bool
);
- } catch (Exception e) {
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
}
-
}
}
--
Gitblit v1.9.1