From 2491fdbdd147897397bfee8c790cd582f3a7f13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Tue, 16 Jun 2026 21:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=96=B9=E5=A2=9E=E5=8A=A0bu?=
 =?UTF-8?q?g=EF=BC=8Coms=E7=BA=BF=E8=B7=AF=E4=BF=AE=E5=A4=8D=EF=BC=8Co-t?=
 =?UTF-8?q?=E6=8A=A5=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/service/UserShipperApplicationService.java    | 2 +-
 .../domain/userAggregate/repository/mapper/UserMapper.java    | 2 +-
 mhd-user-center/src/main/resources/mapper/UserMapper.xml      | 2 +-
 .../repository/po/BusinessDocumentOrderPO.java                | 4 ++++
 .../executeOrder/repository/persistence/ExecuteOrderImpl.java | 2 ++
 .../oms/domain/executeOrder/repository/po/ExecuteOrderPO.java | 3 +++
 .../businessDocumentOrder/BusinessDocumentOrderMapper.xml     | 4 +++-
 .../main/resources/mapper/executeOrder/ExecuteOrderMapper.xml | 4 +++-
 8 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
index cea098370..86a7b53ab 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java
@@ -316,7 +316,7 @@ public class UserShipperApplicationService {
         if (ObjectUtil.isNull(configSwitch)) {
             throw new ServiceException("获取组织配置失败");
         }
-        List<UserEntity> userEntities = userMapper.selectByUserPhone(userShipperDO.getUserPhone());
+        List<UserEntity> userEntities = userMapper.selectByUserPhone(userShipperDO.getUserAccount());
         if (userEntities.size()>0){
             throw new ServiceException("账户名已存在");
         }
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java
index 7ef0384b8..299465dce 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java
@@ -80,5 +80,5 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     Integer getOrdIsQueue(Long organizationId);
 
-    List<UserEntity> selectByUserPhone(String userPhone);
+    List<UserEntity> selectByUserPhone(String userAccount);
 }
\ No newline at end of file
diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml
index 46852813a..8e7d02061 100644
--- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml
@@ -800,7 +800,7 @@
         SELECT is_queue from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where ORGANIZATION_ID = #{organizationId}
     </select>
     <select id="selectByUserPhone" resultType="com.mhd.user.domain.userAggregate.entity.UserEntity">
-        select * from "USER" where user_phone = #{userPhone} and del_flag = 1
+        select * from "USER" where user_account = #{userAccount} and del_flag = 1
     </select>
 
 </mapper>
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
index 584308d15..b177fea75 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java
@@ -520,6 +520,10 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String route;
 
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String routeName;
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String containerType;
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 c012a6475..74d4975b4 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
@@ -212,6 +212,8 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setOrganizationId(organizationId);
                     tmsOrderAddDTO.setLoginUser(loginUser);
                     tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
+                    tmsOrderAddDTO.setIsDeclare(businessDocumentOrder.getIsDeclare().intValue());
+                    tmsOrderAddDTO.setIsDeclare(businessDocumentOrder.getIsDeclare() != null ? businessDocumentOrder.getIsDeclare().intValue() : null);
                     String mainOrderNum = businessDocumentOrder.getMainOrderNum();
                     if (mainOrderNum != null) {
                         tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);
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 cb723b526..a950d614e 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
@@ -207,6 +207,9 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @ApiModelProperty("运输线路")
     private String route;
 
+    @ApiModelProperty("运输线路")
+    private String routeName;
+
     @ApiModelProperty("发票编号")
     @Excel(name = "发票编号")
     private String invoiceNumber;
diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
index c8bb09b06..2bfc4f928 100644
--- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml
@@ -201,8 +201,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --             GROUP BY child.MAIN_ORDER_NUM
 --         ) tms_count ON tms_count.MAIN_ORDER_NUM = bdo.goods_number
         SELECT bdo.*,
-               NVL(tms_count.total, 0) AS tms_order_status_count
+               NVL(tms_count.total, 0) AS tms_order_status_count,
+               NVL(tr.ROUTE_NAME, bdo.route) AS routeName
         FROM business_document_order bdo
+            left join NGWL_TEST_WLHY.tms_route tr on tr.id = bdo.route
                  LEFT JOIN (
             SELECT child.MAIN_ORDER_NUM, COUNT(1) AS total
             FROM business_document_order child
diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
index c7e240551..4ab028a8c 100644
--- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
@@ -29,13 +29,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             eo.*,
             bdo.main_order_num,
             bdo.RECIPIENT_NAME,
-            bdo.train_no
+            bdo.train_no,
+            NVL(tr.ROUTE_NAME, bdo.route) AS routeName
         FROM
             execute_order eo
                 LEFT JOIN
             BUSINESS_DOCUMENT_ORDER bdo
             ON
                 eo.BUSINESS_DOCUMENT_NUMBER = bdo.goods_number
+                left join NGWL_TEST_WLHY.tms_route tr on tr.id = bdo.route
     </sql>
 
     <sql id="selectExecuteOrderPo1">