From a1bd94370bc1fceeeed0850fbafc9d086d4b2388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Tue, 16 Dec 2025 10:16:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(api):=20=E4=BF=AE=E5=A4=8DIFS=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除从错误日志中重新构建请求参数的冗余代码
- 直接使用保存的请求数据避免潜在的数据不一致问题
- 简化请求处理流程提高代码可读性

refactor(sql): 修改wcs集成查询排序字段

- 将运输任务明细查询的排序字段由start_time改为task_no
- 提高查询结果的稳定性和预期性
---
 .../impl/IfsCallErrorLogServiceImpl.java      | 28 +------------------
 .../WcsIntegrationMapper.xml                  |  2 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
index 720a485..f72dc57 100644
--- a/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/api/service/impl/IfsCallErrorLogServiceImpl.java
@@ -283,34 +283,8 @@ public class IfsCallErrorLogServiceImpl extends ServiceImpl<IfsCallErrorLogMappe
         String ifsResponse = null;
 
         try {
-            // 1. 从错误日志中恢复请求参数 - rqrq
-            // if (errorLog.getRequestData() == null || errorLog.getRequestData().isEmpty()) {
-                // 如果没有保存请求数据，重新构建 - rqrq
-                Map<String, Object> params = new HashMap<>();
-                params.put("ifsDBName", ifsDBName);
-                params.put("domainUserID", domainUserID);
-                params.put("ifsSiteID", errorLog.getSite());
-                params.put("partNo", errorLog.getPartNo());
-                params.put("qtyToIssue", errorLog.getQty());
-                params.put("locationNo", errorLog.getSourceLocation());
-                params.put("destLocationNo", errorLog.getDestLocation());
-                params.put("lotBatchNo", errorLog.getLotBatchNo());
-
-                if (errorLog.getExpiredDate() != null) {
-                    params.put("expiryDate", new SimpleDateFormat("yyyy-MM-dd").format(errorLog.getExpiredDate()));
-                } else {
-                    params.put("expiryDate", null);
-                }
-
-                ObjectMapper objectMapper = new ObjectMapper();
-                jsonBody = objectMapper.writeValueAsString(params);
-            // } else {
-            //     // 使用保存的请求数据 - rqrq
-            //     jsonBody = errorLog.getRequestData();
-            // }
-            //
-            System.out.println("请求数据: " + jsonBody);
             jsonBody = errorLog.getRequestData();
+            System.out.println("请求数据: " + jsonBody);
             // 2. 调用IFS接口 - rqrq
             ifsResponse = HttpUtils.doPost(ifsUrl + errorLog.getInterfaceName(), jsonBody, null);
 
diff --git a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
index ba4ba47..fcccb28 100644
--- a/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
@@ -1914,7 +1914,7 @@
         FROM wms_transport_task_detail WITH (NOLOCK)
         WHERE action_type = '等待通道机复核'
           AND status = '等待中'
-        ORDER BY start_time DESC
+        ORDER BY task_no DESC
     </select>
     
     <!-- rqrq - 更新任务明细的RFID复核结果 -->