From 3759a40aad8191f82f4a2eac54c9045dcf6a0fb3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 09:46:59 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 92 +++++++++++++++++++++++++--------------------
1 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index c9c05e4..f6e820f 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
@@ -19,6 +20,7 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -56,51 +58,59 @@
public void execute() throws IOException {
List<TaskWrk> taskWrkList = taskWrkService.selectToBeHistoryData();
for (TaskWrk taskWrk : taskWrkList) {
- JSONObject jsonObject = null;
- String response = null;
boolean success = false;
- HashMap<String, Object> map = new HashMap<>();
- try {
- map.put("taskNo",taskWrk.getTaskNo());
- map.put("taskStatus",taskWrk.getStatus());
- map.put("ioType",taskWrk.getIoTypeWms());
- map.put("barCode",taskWrk.getBarcode());
- map.put("reportTime",new Date());
- map.put("weight",taskWrk.getScWeight().doubleValue());
- response = new HttpHandler.Builder()
- .setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
- .setJson(JSON.toJSONString(map))
- .build()
- .doPost();
- jsonObject = JSON.parseObject(response);
-
- if (jsonObject.getInteger("code").equals(200)) {
- if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
- log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
- return ;
- }
- success = true;
- //鍒犻櫎浠诲姟
- taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
- } else {
- log.error("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤澶辫触" + taskWrk);
+ if (taskWrk.getIoType()==4){
+ if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
+ log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+ return ;
}
- } catch (Exception e) {
- log.error("wms閫氳澶辫触," + e.getMessage());
- } finally {
- apiLogService.save("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤"
- , wmsUrl + taskStatusFeedbackPath
- , null
- , "127.0.0.1"
- , JSON.toJSONString(map)
- , response
- , success
- );
+ success = true;
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
+ } else {
+ JSONObject jsonObject = null;
+ String response = null;
+ HashMap<String, Object> map = new HashMap<>();
+ try {
+ map.put("taskNo",taskWrk.getTaskNo());
+ map.put("taskStatus",taskWrk.getStatusWms());
+ map.put("ioType",taskWrk.getIoTypeWms());
+ map.put("barCode",taskWrk.getBarcode());
+ map.put("reportTime", LocalDateTime.now());
+ map.put("weight",taskWrk.getScWeight().doubleValue());
+ response = new HttpHandler.Builder()
+ .setUri(wmsUrl)
+ .setPath(taskStatusFeedbackPath)
+ .setJson(JSON.toJSONString(map))
+ .build()
+ .doPost();
+ jsonObject = JSON.parseObject(response);
+
+ if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
+ if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
+ log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+ return ;
+ }
+ success = true;
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
+ } else {
+ log.error("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤澶辫触" + taskWrk);
+ }
+ } catch (Exception e) {
+ log.error("wms閫氳澶辫触," + e.getMessage());
+ } finally {
+ apiLogService.save("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤"
+ , wmsUrl + taskStatusFeedbackPath
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(map)
+ , response
+ , success
+ );
+ }
}
}
-
-
}
}
--
Gitblit v1.9.1