From 13636989e61f953be628c81dd5d9041c507e4041 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 21 Jan 2026 09:26:13 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-21=20=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/service/impl/ErpInterfaceServiceImpl.java    | 12 ++++++------
 .../sys/controller/InterfaceLogController.java       |  3 +--
 2 files changed, 7 insertions(+), 8 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 d392270..bf969c3 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
@@ -475,7 +475,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService {
         
         if ("GetSaveurchaseReturn".equals(interfaceName) || "GetSaveurchaseIn".equals(interfaceName)) {
             // 采购退货/采购入库
-            headEntity.setOrderref1(nullToEmpty(firstLog.getDocumentNo()));  // MESCCode
+            headEntity.setOrderref1(nullToEmpty(firstLog.getTransactionId()));  // MESCCode
             headEntity.setOrderref2(kdType);  // KdType
             headEntity.setOrderref3(formatDate(firstLog.getTransactionDate()));  // DDate
             headEntity.setOrderref4(nullToEmpty(firstLog.getDocumentNoType()));  // CRdCode
@@ -485,7 +485,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService {
             headEntity.setOrderref8("");  // CDepCode
         } else if ("GetSaveSalesOut".equals(interfaceName) || "GetSaveSalesReturn".equals(interfaceName)) {
             // 销售出库/销售退货
-            headEntity.setOrderref1(nullToEmpty(firstLog.getDocumentNo()));  // MESCCode
+            headEntity.setOrderref1(nullToEmpty(firstLog.getTransactionId()));  // MESCCode
             headEntity.setOrderref2(kdType);  // KdType
             headEntity.setOrderref3(formatDate(firstLog.getTransactionDate()));  // DDate
             headEntity.setOrderref4("");  // CBusType
@@ -495,7 +495,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService {
             headEntity.setOrderref8("");  // CDepCode
         } else if ("GetSaveOthersStorageOut".equals(interfaceName) || "GetSaveOthersStorage".equals(interfaceName)) {
             // 其他出库/其他入库
-            headEntity.setOrderref1(nullToEmpty(firstLog.getDocumentNo()));  // MESCCode
+            headEntity.setOrderref1(nullToEmpty(firstLog.getTransactionId()));  // MESCCode
             headEntity.setOrderref2(kdType);  // KdType
             headEntity.setOrderref3(formatDate(firstLog.getTransactionDate()));  // DDate
             headEntity.setOrderref4(firstLog.getDocumentNoType());  // CRdCode
@@ -505,7 +505,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService {
             headEntity.setOrderref8(firstLog.getDepartmentId());
         } else if ("GetSaveroductionIssue".equals(interfaceName) || "GetSaveroductionReturn".equals(interfaceName)) {
             // 生产领料/生产退料
-            headEntity.setOrderref1(nullToEmpty(firstLog.getDocumentNo()));  // MESCCode
+            headEntity.setOrderref1(nullToEmpty(firstLog.getTransactionId()));  // MESCCode
             headEntity.setOrderref2(kdType);  // KdType
             headEntity.setOrderref3(formatDate(firstLog.getTransactionDate()));  // DDate
             headEntity.setOrderref4(nullToEmpty(firstLog.getDocumentNoType()));  // CRdCode
@@ -515,7 +515,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService {
             headEntity.setOrderref8("");  // CDepCode
         } else if ("GetSaveroductionIn".equals(interfaceName)) {
             // 生产入库
-            headEntity.setOrderref1(nullToEmpty(firstLog.getDocumentNo()));  // MESCCode
+            headEntity.setOrderref1(nullToEmpty(firstLog.getTransactionId()));  // MESCCode
             headEntity.setOrderref2("");  // 生产入库没有KdType
             headEntity.setOrderref3(formatDate(firstLog.getTransactionDate()));  // DDate
             headEntity.setOrderref4(nullToEmpty(firstLog.getDocumentNoType()));  // CRdCode
@@ -525,7 +525,7 @@ public class ErpInterfaceServiceImpl implements ErpInterfaceService {
             headEntity.setOrderref8(nullToEmpty(firstLog.getDepartmentId()));  // CDepCode
         } else {
             // 默认格式
-            headEntity.setOrderref1(nullToEmpty(firstLog.getDocumentNo()));
+            headEntity.setOrderref1(nullToEmpty(firstLog.getTransactionId()));
             headEntity.setOrderref2(kdType);
             headEntity.setOrderref3(formatDate(firstLog.getTransactionDate()));
             headEntity.setOrderref4(nullToEmpty(firstLog.getDocumentNoType()));
diff --git a/src/main/java/com/gaotao/modules/sys/controller/InterfaceLogController.java b/src/main/java/com/gaotao/modules/sys/controller/InterfaceLogController.java
index 28578b0..4757c47 100644
--- a/src/main/java/com/gaotao/modules/sys/controller/InterfaceLogController.java
+++ b/src/main/java/com/gaotao/modules/sys/controller/InterfaceLogController.java
@@ -35,8 +35,7 @@ public class InterfaceLogController {
         String site = (String) params.get("site");
         String buNo = (String) params.get("buNo");
         String requestId = (String) params.get("requestId");
-        Integer requestGroupId = params.get("requestGroupId") != null ? 
-            Integer.parseInt(params.get("requestGroupId").toString()) : null;
+        Integer requestGroupId = params.get("requestGroupId") != null ? Integer.parseInt(params.get("requestGroupId").toString()) : null;
         String interfaceName = (String) params.get("interfaceName");
         
         return interfaceLogService.getParams(site, buNo, requestId, requestGroupId, interfaceName);