From 4c43f2b6dcfd1f3cdf8c24ea105f98fef75b53a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Sat, 30 May 2026 18:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E5=8D=95bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mhd/system/api/domain/TmsOrderAddDTO.java    | 8 ++++++++
 .../repository/persistence/BusinessDocumentOrderImpl.java | 7 +++++++
 .../repository/persistence/ExecuteOrderImpl.java          | 7 +++++++
 .../domain/executeOrder/repository/po/ExecuteOrderPO.java | 1 +
 .../resources/mapper/executeOrder/ExecuteOrderMapper.xml  | 3 ++-
 5 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderAddDTO.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderAddDTO.java
index 9a6e121ba..82564882a 100644
--- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderAddDTO.java
+++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/TmsOrderAddDTO.java
@@ -499,4 +499,12 @@ TmsOrderAddDTO implements Serializable {
     @ApiModelProperty("发票编号")
     @Excel(name = "发票编号")
     private String invoiceNumber;
+
+    @ApiModelProperty("订单号")
+    @Excel(name = "订单号")
+    private String goodsNumber;
+
+    @ApiModelProperty("业务主单")
+    @Excel(name = "业务主单")
+    private String businessMainOrder;
 }
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
index 07f2e62e5..6af28eb52 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
@@ -550,6 +550,13 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                 //相加
                 tmsOrderAddDTO.setGoodsName("数量"+String.valueOf(bag + box));
             }
+            tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
+            String mainOrderNum = businessDocumentOrder.getMainOrderNum();
+            if (mainOrderNum != null) {
+                tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
+            }else {
+                tmsOrderAddDTO.setBusinessMainOrder(businessDocumentOrder.getGoodsNumber());
+            }
             
             //货物信息
             List<BusinessDocumentCargoMulti> businessDocumentCargoMultiList=businessDocumentCargoMultiMapper.selectList(new QueryWrapper<BusinessDocumentCargoMulti>().lambda()
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
index 8938d49e8..c012a6475 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
@@ -211,6 +211,13 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setOrderSource("0");
                     tmsOrderAddDTO.setOrganizationId(organizationId);
                     tmsOrderAddDTO.setLoginUser(loginUser);
+                    tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
+                    String mainOrderNum = businessDocumentOrder.getMainOrderNum();
+                    if (mainOrderNum != null) {
+                        tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
+                    }else {
+                        tmsOrderAddDTO.setBusinessMainOrder(businessDocumentOrder.getGoodsNumber());
+                    }
                     BusinessDeliveryDetailsLink businessDeliveryDetailsLink = businessDeliveryDetailsLinkMapper.selectOne(new LambdaQueryWrapper<BusinessDeliveryDetailsLink>().eq(BusinessDeliveryDetailsLink::getSubOrderId, businessDocumentOrder.getId()));
                     if (ObjectUtil.isNotNull(businessDeliveryDetailsLink)) {
                         Integer bag = businessDeliveryDetailsLink.getBag();
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
index e4a592e75..0421d99ed 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java
@@ -221,4 +221,5 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @ApiModelProperty("卸货联系人")
     @Excel(name = "卸货联系人")
     private String dischargerName;
+
 }
diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
index d38c9d68e..d04f84d3d 100644
--- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
@@ -27,7 +27,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectExecuteOrderPo">
         SELECT
             eo.*,
-            bdo.main_order_num
+            bdo.main_order_num,
+            bdo.RECIPIENT_NAME
         FROM
             execute_order eo
                 LEFT JOIN