From fdfb8877851ef6a3041d654194b98831bb42a68c Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 07 三月 2025 16:51:33 +0800
Subject: [PATCH] 更改给堆垛机下发任务五次，完善第三方日志搜索功能

---
 src/main/webapp/views/apiLog/apiLog.html                    |    4 ++--
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   23 +++++++++++++++--------
 src/main/java/com/zy/asrs/task/autoReportStartHandler.java  |    7 +++++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index aea5740..d8ab81a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -977,15 +977,15 @@
                     // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
                     Date now = new Date();
                     taskWrk.setWrkSts(12);
-                    taskWrk.setStatus(2);
                     taskWrk.setModiTime(now);
                     if (taskWrkMapper.updateById(taskWrk) == 0) {
                         log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
                     }
+                    String response = "";
+                    Boolean bool=false;
+                    HashMap<String, Object> headParam = new HashMap<>();
+                    headParam.put("TaskNo", taskWrk.getTaskNo());
                     try {
-                        HashMap<String, Object> headParam = new HashMap<>();
-                        headParam.put("TaskNo", taskWrk.getTaskNo());
-                        String response;
                         response = new HttpHandler.Builder()
                                 // .setHeaders(headParam)
                                 .setUri(wmsUrl)
@@ -994,17 +994,24 @@
                                 .build()
                                 .doPost();
                         JSONObject jsonObject = JSON.parseObject(response);
+                        if(jsonObject.get("ReturnStatus").equals(0)){
+                            bool = true;
+                            taskWrk.setStatus(2);
+                            taskWrkMapper.updateById(taskWrk);
+                        }
+
+                    } catch (Exception e) {
+                        log.error("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触", taskWrk);
+//                        throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触");
+                    }finally {
                         apiLogService.save("wcs娲惧彂绉诲簱浠诲姟涓婃姤wms"
                                 , wmsUrl + taskStatusFeedbackPath
                                 , null
                                 , "127.0.0.1"
                                 , JSON.toJSONString(headParam)
                                 , response
-                                , true
+                                , bool
                         );
-                    } catch (Exception e) {
-                        log.error("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触", taskWrk);
-//                        throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触");
                     }
 
                 }
diff --git a/src/main/java/com/zy/asrs/task/autoReportStartHandler.java b/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
index f07d897..f0ee945 100644
--- a/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
+++ b/src/main/java/com/zy/asrs/task/autoReportStartHandler.java
@@ -92,6 +92,7 @@
                     HashMap<String, Object> hashMap = new HashMap<>();
                     hashMap.put("TaskNo",taskWrk.getTaskNo());
                     String response = "";
+                    Boolean bool = false;
                     try {
                         //寮�濮嬩笂鎶�,鍑哄簱浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
                         response = new HttpHandler.Builder()
@@ -101,13 +102,16 @@
                                 .build()
                                 .doPost();
                         JSONObject jsonObject = JSON.parseObject(response);
-                        Boolean bool = false;
+
                         if(jsonObject.get("ReturnStatus").equals(0)){
                             bool = true;
                             taskWrk.setMarkStart(1);
                             taskWrk.setStatus(2);
                             taskWrkMapper.updateById(taskWrk);
                         }
+
+                    } catch (Exception e) {
+                    }finally {
                         apiLogService.save("wcs寮�濮嬩换鍔′笂鎶ms"
                                 , wmsUrl + TaskExecCallback
                                 , null
@@ -116,7 +120,6 @@
                                 , response
                                 , bool
                         );
-                    } catch (Exception e) {
                     }
                 }
             }
diff --git a/src/main/webapp/views/apiLog/apiLog.html b/src/main/webapp/views/apiLog/apiLog.html
index d8fb528..4b00cfc 100644
--- a/src/main/webapp/views/apiLog/apiLog.html
+++ b/src/main/webapp/views/apiLog/apiLog.html
@@ -24,12 +24,12 @@
                     </div>
                     <div class="layui-inline" style="width: 300px">
                         <div class="layui-input-inline">
-                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                            <input class="layui-input layui-laydate-range" name="request" type="text" placeholder="璇锋眰鍐呭" autocomplete="off" style="width: 300px">
                         </div>
                     </div>
                     <div class="layui-inline">
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                            <input class="layui-input" type="text" name="response" placeholder="鍝嶅簲鍐呭" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">&emsp;

--
Gitblit v1.9.1