From 926261e9388473ab2e09645ba6a8ada7469f10aa Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 22 十月 2024 14:09:51 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   64 ++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 8463ff2..598aca2 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -49,32 +49,56 @@
 
     @Value("${wms.url}")
     private String wmsUrl;
-    @Value("${wms.movePath}")
-    private String movePath;
+    @Value("${wms.taskStatusFeedbackPath}")
+    private String taskStatusFeedbackPath;
 
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute() throws IOException {
         for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
-            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚
-                //鍖哄垎鍏ュ嚭搴�
-                TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
-                if (!wrkLogService.insert(taskWrkLog)) {
-                    throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
-                }
-                if (!taskWrkService.deleteById(taskWrk)) {
-                    throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
-                }
-            } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
-                TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
-                if(!wrkLogService.insert(taskWrkLog)){
-                    throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
-                }
-                if(!taskWrkService.deleteById(taskWrk)){
-                    throw new CoolException("浠诲姟妗e垹闄ゅけ璐�"+taskWrkLog);
-                }
-            }
+            JSONObject jsonObject = null;
+            String response = null;
+            boolean success = false;
+            HashMap<String, Object> map = new HashMap<>();
+            try {
+                map.put("taskNo", taskWrk.getTaskNo());
+                map.put("status",5);
+                map.put("ioType", taskWrk.getIoType());
+                map.put("barcode", taskWrk.getBarcode());
+                map.put("reportTime", new Date());
+                response = new HttpHandler.Builder()
+                        .setUri(wmsUrl)
+                        .setPath(taskStatusFeedbackPath)
+                        .setJson(JSON.toJSONString(map))
+                        .build()
+                        .doPost();
+                jsonObject = JSON.parseObject(response);
 
+                if (jsonObject.getInteger("code").equals(200)) {
+                    if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
+                        log.error("浠诲姟妗h浆浠诲姟鍘嗗彶妗eけ璐�" + taskWrk);
+                        return ;
+                    }
+                    success = true;
+                    //鍒犻櫎浠诲姟
+                    taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
+                } else {
+                    log.error("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤澶辫触" + taskWrk);
+                }
+            } catch (Exception e) {
+                log.error("wms閫氳澶辫触," + e.getMessage());
+            } finally {
+                apiLogService.save("wms鍏ュ簱鍑哄簱瀹屾垚涓婃姤"
+                        , wmsUrl + taskStatusFeedbackPath
+                        , null
+                        , "127.0.0.1"
+                        , JSON.toJSONString(map)
+                        , response
+                        , success
+                );
+            }
         }
+
+
     }
 
 }

--
Gitblit v1.9.1