From 95cc083ea58c4db51d0b89184c58ad67bc4f3b12 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 20 三月 2025 15:38:00 +0800
Subject: [PATCH] 初始化

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   64 ++++++++++++++++++++++++++------
 1 files changed, 52 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 c3c5024..01eb951 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -53,8 +53,8 @@
     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;
 
@@ -68,18 +68,58 @@
         List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().in("wrk_sts", 7,18));
         for (TaskWrk taskWrk : taskWrkList) {
             TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
-            if(taskWrkLog.getIoType().equals(2)){
-                taskWrkLog.setWrkSts(19);
-            }else{
+            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("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
+                }
+            }else if(taskWrkLog.getIoType().equals(2)){
+                BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("wrk_no",taskWrk.getWrkNo()));
+                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)){
+                        }
+                    } 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("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
+                    }
+                }
+
             }
-            taskWrkLog.setModiTime(new Date());
-            if (!wrkLogService.insert(taskWrkLog)) {
-                throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
-            }
-            if (!taskWrkService.deleteById(taskWrk)) {
-                throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
-            }
+
         }
     }
 }

--
Gitblit v1.9.1