From 15ef0370ab5583039a1e2323996b426a4be9f31b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 17 Dec 2025 14:23:45 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-17=20erp=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ErpInterfaceServiceImpl.java | 11 +++++-
 .../service/impl/InterfaceLogServiceImpl.java | 10 ++++--
 .../service/impl/SystemLogServiceImpl.java    | 10 ++++--
 src/main/resources/mapper/sys/ApiLogIdDao.xml | 34 ++-----------------
 4 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java b/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java
index 26fed13..1ee4e57 100644
--- a/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/erp/service/impl/ErpInterfaceServiceImpl.java
@@ -222,7 +222,16 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService {
             headEntity.setRequestId(requestId);
             headEntity.setRequestGroupId(requestGroupId);
             headEntity.setOrderref1(firstLog.getDocumentNo());
-            headEntity.setOrderref2(firstLog.getTransactionType());
+            String txType = firstLog.getTransactionType();
+            String txTypeName = "";
+            if ("O".equals(txType)) {
+                txTypeName = "领料";
+            } else if ("I".equals(txType)) {
+                txTypeName = "退料";
+            } else {
+                txTypeName = txType != null ? txType : "";
+            }
+            headEntity.setOrderref2(txTypeName);
             headEntity.setOrderref3(formatDate(firstLog.getTransactionDate()));
             headEntity.setOrderref4(firstLog.getDocumentNoType());
             headEntity.setOrderref5("");
diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java
index 67f5d1a..6d3959c 100644
--- a/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/sys/service/impl/InterfaceLogServiceImpl.java
@@ -78,13 +78,15 @@ public class InterfaceLogServiceImpl implements InterfaceLogService {
             // 构造返回的JSON结构
             Map<String, Object> result = new LinkedHashMap<>();
             
-            // 处理主表数据（将orderref1-20映射为"接口参数1"-"接口参数20"）
+            // 处理主表数据（使用getFieldName映射字段名）
             if (head != null) {
                 for (int i = 1; i <= 20; i++) {
                     String key = "orderref" + i;
                     Object value = head.get(key);
                     if (value != null && !value.toString().trim().isEmpty()) {
-                        result.put("接口参数" + i, value);
+                        // 使用getFieldName获取实际的字段名
+                        String fieldName = getFieldName(i, true);
+                        result.put(fieldName, value);
                     }
                 }
             }
@@ -100,7 +102,9 @@ public class InterfaceLogServiceImpl implements InterfaceLogService {
                         String key = "orderref" + i;
                         Object value = detail.get(key);
                         if (value != null && !value.toString().trim().isEmpty()) {
-                            detailResult.put("接口参数" + i, value);
+                            // 使用getFieldName获取实际的字段名
+                            String fieldName = getFieldName(i, false);
+                            detailResult.put(fieldName, value);
                         }
                     }
                     
diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/SystemLogServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/SystemLogServiceImpl.java
index 2738ae2..56a6b4a 100644
--- a/src/main/java/com/gaotao/modules/sys/service/impl/SystemLogServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/sys/service/impl/SystemLogServiceImpl.java
@@ -78,13 +78,15 @@ public class SystemLogServiceImpl implements SystemLogService {
             // 构造返回的JSON结构
             Map<String, Object> result = new LinkedHashMap<>();
             
-            // 处理主表数据（将orderref1-20映射为"接口参数1"-"接口参数20"）
+            // 处理主表数据（使用getFieldName映射字段名）
             if (head != null) {
                 for (int i = 1; i <= 20; i++) {
                     String key = "orderref" + i;
                     Object value = head.get(key);
                     if (value != null && !value.toString().trim().isEmpty()) {
-                        result.put("接口参数" + i, value);
+                        // 使用getFieldName获取实际的字段名
+                        String fieldName = getFieldName(i, true);
+                        result.put(fieldName, value);
                     }
                 }
             }
@@ -100,7 +102,9 @@ public class SystemLogServiceImpl implements SystemLogService {
                         String key = "orderref" + i;
                         Object value = detail.get(key);
                         if (value != null && !value.toString().trim().isEmpty()) {
-                            detailResult.put("接口参数" + i, value);
+                            // 使用getFieldName获取实际的字段名
+                            String fieldName = getFieldName(i, false);
+                            detailResult.put(fieldName, value);
                         }
                     }
                     
diff --git a/src/main/resources/mapper/sys/ApiLogIdDao.xml b/src/main/resources/mapper/sys/ApiLogIdDao.xml
index 8d0e5c6..366e6dd 100644
--- a/src/main/resources/mapper/sys/ApiLogIdDao.xml
+++ b/src/main/resources/mapper/sys/ApiLogIdDao.xml
@@ -3,37 +3,9 @@
 
 <mapper namespace="com.gaotao.modules.sys.dao.ApiLogIdDao">
 
-    <!-- 获取并自增request_id -->
-    <select id="getAndIncrementRequestId" resultType="string">
-        DECLARE @currentId NVARCHAR(50);
-        DECLARE @nextId NVARCHAR(50);
-        
-        -- 获取当前request_id
-        SELECT @currentId = request_id 
-        FROM api_log_id WITH(UPDLOCK, ROWLOCK)
-        WHERE interface_name = #{interfaceName};
-        
-        -- 如果不存在，初始化为 'REQ000001'
-        IF @currentId IS NULL
-        BEGIN
-            SET @currentId = 'REQ000001';
-            INSERT INTO api_log_id (interface_name, request_id)
-            VALUES (#{interfaceName}, 'REQ000002');
-        END
-        ELSE
-        BEGIN
-            -- 提取数字部分并自增
-            DECLARE @numPart INT;
-            SET @numPart = CAST(SUBSTRING(@currentId, 4, LEN(@currentId)) AS INT) + 1;
-            SET @nextId = 'REQ' + RIGHT('000000' + CAST(@numPart AS VARCHAR), 6);
-            
-            -- 更新为下一个ID
-            UPDATE api_log_id 
-            SET request_id = @nextId
-            WHERE interface_name = #{interfaceName};
-        END
-        
-        SELECT @currentId AS request_id;
+    <!-- 获取并自增request_id，调用存储过程GetNextRequestId -->
+    <select id="getAndIncrementRequestId" resultType="string" statementType="CALLABLE">
+        {CALL GetNextRequestId(#{interfaceName})}
     </select>
 
     <!-- 初始化接口的request_id -->