From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:54:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   43 +++++++++++++++++++++++++++----------------
 1 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 29f7382..afb6bc3 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -22,6 +22,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -80,21 +81,21 @@
                     taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
                     taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
                     Date now = new Date();
-                    //鏇存柊搴撲綅鐘舵��
-                    LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
-                    locMast.setLocSts("K");//O.绌哄簱浣�
-                    locMast.setBarcode("");//鎵樼洏鐮�
-                    locMast.setModiTime(now);
-                    locMast.setModiUser(9999L);
-                    locMastService.updateById(locMast);
-
-                    //鏇存柊搴撲綅鐘舵��
-                    LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
-                    locMast2.setLocSts("Z");//F.鍦ㄥ簱
-                    locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
-                    locMast2.setModiTime(now);
-                    locMast2.setModiUser(9999L);
-                    locMastService.updateById(locMast2);
+//                    //鏇存柊搴撲綅鐘舵��
+//                    LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+//                    locMast.setLocSts("K");//O.绌哄簱浣�
+//                    locMast.setBarcode("");//鎵樼洏鐮�
+//                    locMast.setModiTime(now);
+//                    locMast.setModiUser(9999L);
+//                    locMastService.updateById(locMast);
+//
+//                    //鏇存柊搴撲綅鐘舵��
+//                    LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+//                    locMast2.setLocSts("Z");//F.鍦ㄥ簱
+//                    locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+//                    locMast2.setModiTime(now);
+//                    locMast2.setModiUser(9999L);
+//                    locMastService.updateById(locMast2);
                 }
 
                 taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��
@@ -105,6 +106,7 @@
                             .setUri(wmsUrl)
                             .setPath("wcsManager/wcsInterface/taskStatusFeedback")
                             .setJson(JSON.toJSONString(taskOverToWms))
+                            .setTimeout(60, TimeUnit.SECONDS)
                             .build()
                             .doPost();
                 }catch (Exception e){
@@ -202,7 +204,7 @@
             }catch (Exception e){
                 log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
             }
-            ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+//            ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
             apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
                     ,"10.32.53.195:8080"+"/wcsManager/wcsInterface/taskStatusFeedback"
                     ,null
@@ -231,6 +233,15 @@
         }
     }
 
+    @Scheduled(cron = "0 0 1 * * ? ")
+    public void clearApiLog(){
+        try {
+            apiLogService.clearWeekBefore();
+        } catch (Exception e) {
+            log.error("绗笁鏂规帴鍙f棩蹇楄嚜鍔ㄦ竻闄ゅけ璐ワ紙鑼冨洿锛氫竴鍛ㄤ箣鍓�", e);
+        }
+    }
+
 
 
 }

--
Gitblit v1.9.1