From 796cfcc66392f78362cd72ca2510fc5194c0d079 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 17 二月 2025 16:00:58 +0800
Subject: [PATCH] 初始化立福德wcs

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   92 +++++++++++++++++++++++++++-------------------
 1 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 1e53034..f780841 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -61,47 +61,63 @@
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute() throws IOException {
 
-        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);
+        //鍏ュ簱9杞巻鍙叉。
+        List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 9));
+        for (TaskWrk taskWrk : taskWrkList) {
+            TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+            if (!wrkLogService.insert(taskWrkLog)) {
+                throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
             }
-            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 (!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 {
-                apiLogService.save("wcs瀹屾垚鎴栬�呭彇娑堜换鍔′笂鎶ms"
-                        , wmsUrl + TaskExecCallback
-                        , null
-                        , "127.0.0.1"
-                        , JSON.toJSONString(headParam)
-                        , response
-                        , bool
-                );
+            if (!taskWrkService.deleteById(taskWrk)) {
+                throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + 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("浠诲姟妗e垹闄ゅけ璐�" + 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