From 6193eddf242c4b879402367704b8b5b2e8df84a4 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 19 七月 2025 13:29:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 138 +++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 56 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index f780841..f6cf40e 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -53,71 +53,97 @@
private String movePath;
@Value("${wms.inboundTaskApplyPath}")
private String inboundTaskApplyPath;
- @Value("${wms.TaskExecCallback}")
- private String TaskExecCallback;
+ @Value("${wms.taskLeave}")
+ private String taskLeave;
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
+ /**
+ * 鍏ュ嚭搴撲换鍔¤浆鍘嗗彶妗�
+ * @throws IOException
+ */
@Scheduled(cron = "0/3 * * * * ? ")
public void execute() throws IOException {
-
- //鍏ュ簱9杞巻鍙叉。
- List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 9));
+ //鍏ュ簱7杞巻鍙叉。,绉诲簱7杞巻鍙叉。,鍑哄簱18杞�
+ List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>()
+ .in("wrk_sts", 7,17)
+ .or()
+ .in("status",5,7));//鍙栨秷鎴栬�呭畬缁�
+ if(taskWrkList.size() == 0){
+ return;
+ }
for (TaskWrk taskWrk : taskWrkList) {
TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
- if (!wrkLogService.insert(taskWrkLog)) {
- throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
- }
- if (!taskWrkService.deleteById(taskWrk)) {
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ if(taskWrkLog.getIoType().equals(1)){
+ taskWrkLog.setWrkSts(8);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }else if(taskWrkLog.getIoType().equals(2)){
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("wrk_no",taskWrk.getWrkNo()));
+ if(taskWrk.getWrkNo()>=3001&&taskWrk.getWrkNo()<=6000){
+ taskWrkLog.setWrkSts(18);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+ if(basDevp==null){
+ HashMap<Object, Object> headParam = new HashMap<>();
+ String response = "";
+ Boolean bool = false;
+ try {
+ headParam.put("TaskNo", taskWrk.getTaskNo());
+ log.info("wcs"+"鍑哄簱鎼浠诲姟涓婃姤wms={}", taskWrk);
+ response = new HttpHandler.Builder()
+ // .setHeaders(headParam)
+ .setUri(wmsUrl)
+ .setPath(taskLeave)
+ .setJson(JSON.toJSONString(headParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if(jsonObject.get("ReturnStatus").equals(0)){
+ taskWrkLog.setWrkSts(18);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+ } catch (Exception e){
+ log.error("wcs鎼鍑哄簱缁檞ms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
+ }finally {
+ apiLogService.save("wcs鎼鍑哄簱缁檞ms"
+ , wmsUrl + taskLeave
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(headParam)
+ , response
+ , bool
+ );
+ }
+ taskWrkLog.setWrkSts(19);
+ taskWrkLog.setModiTime(new Date());
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+
}
}
-
-// for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
-// HashMap<String, Object> headParam = new HashMap<>();
-// 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);
-// response = new HttpHandler.Builder()
-// // .setHeaders(headParam)
-// .setUri(wmsUrl)
-// .setPath(TaskExecCallback)
-// .setJson(JSON.toJSONString(headParam))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
-// if(jsonObject.get("ReturnStatus").equals(0)){
-// taskWrkLog.setWrkSts(8);
-// if (!wrkLogService.insert(taskWrkLog)) {
-// throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
-// }
-// if (!taskWrkService.deleteById(taskWrk)) {
-// throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
-// }
-// bool = true;
-// }
-// } catch (Exception e) {
-// log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触{},杩斿洖鍊�={}", taskWrk, response);
-// } finally {
-// apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
-// , wmsUrl + TaskExecCallback
-// , null
-// , "127.0.0.1"
-// , JSON.toJSONString(headParam)
-// , response
-// , bool
-// );
-// }
-// }
}
-
}
--
Gitblit v1.9.1