From f3f76a51c4e41ae9617b592ae7747ba6b4d8d272 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 18 四月 2025 15:06:15 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   88 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 75 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 27bac8f..be9bc8b 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,15 +1,28 @@
 package com.zy.asrs.task;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.TaskWrkService;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskOverToWms;
+import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
+import com.zy.asrs.utils.PostMesDataUtils;
+import com.zy.common.utils.HttpHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -22,20 +35,69 @@
     private TaskWrkService taskWrkService;
     @Autowired
     private CommandInfoService commandInfoService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private BasDevpService basDevpService;
+
+    @Autowired
+    private StaDescService staDescService;
+    @Autowired
+    private LocMastService locMastService;
+    @Autowired
+    private TaskWrkLogServiceImpl wrkLogService;
+
+    @Value("${wms.url}")
+    private String wmsUrl;
+    @Value("${wms.taskStatusFeedbackPath}")
+    private String taskStatusFeedbackPath;
 
     @Scheduled(cron = "0/3 * * * * ? ")
-    public void execute() {
+    public void execute() throws IOException {
         for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
-            if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
-                //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
-                commandInfoService.saveToHistory(taskWrk.getTaskNo());
+            JSONObject jsonObject = null;
+            String response = null;
+            boolean success = false;
+            HashMap<String, Object> map = new HashMap<>();
+            try {
+                map.put("taskNo",taskWrk.getTaskNo());
+                map.put("status",taskWrk.getStatus());
+                map.put("ioType",taskWrk.getIoType());
+                map.put("barcode",taskWrk.getBarcode());
+                response = new HttpHandler.Builder()
+                        .setUri(wmsUrl)
+                        .setPath(taskStatusFeedbackPath)
+                        .setJson(JSON.toJSONString(map))
+                        .build()
+                        .doPost();
+                jsonObject = JSON.parseObject(response);
 
-                //鍒犻櫎浠诲姟
-                taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
-                //鍒犻櫎鎸囦护
-                commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
+                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