From e667f22564ac08372a3c9353f20ee1adb6d85643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Tue, 21 Apr 2026 16:25:52 +0800
Subject: [PATCH] =?UTF-8?q?oms=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserShipperMapper.xml        | 1 +
 .../BusinessDocumentOrderApplicationService.java           | 4 ++--
 .../executeOrder/ExecuteOrderApplicationService.java       | 4 ++--
 .../repository/facade/IBusinessDocumentOrderService.java   | 2 +-
 .../repository/persistence/BusinessDocumentOrderImpl.java  | 6 +++++-
 .../service/BusinessDocumentOrderDomainService.java        | 4 ++--
 .../repository/facade/IExecuteOrderService.java            | 2 +-
 .../executeOrder/repository/mapper/ExecuteOrderMapper.java | 1 +
 .../repository/persistence/ExecuteOrderImpl.java           | 7 +++++--
 .../executeOrder/service/ExecuteOrderDomainService.java    | 4 ++--
 .../repository/todo/ReservationInMaterialDetailDO.java     | 1 +
 .../dto/businessDocumentAddressMulti/BusinessAuditDTO.java | 3 +++
 .../businessDocumentOrder/BusinessDocumentOrderApi.java    | 2 +-
 .../interfaces/facade/executeOrder/ExecuteOrderApi.java    | 2 +-
 .../resources/mapper/executeOrder/ExecuteOrderMapper.xml   | 3 +++
 15 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
index 3bcdfb602..7a1343681 100644
--- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
@@ -173,6 +173,7 @@
         WHERE a.del_flag = 1
           AND (b.del_flag = 1 OR b.del_flag IS NULL)
 					AND a.business_type IN (1,3)
+          AND a.role_code != 'customer'
     </sql>
 
     <select id="selectList" parameterType="com.mhd.user.domain.userAggregate.repository.todo.UserShipperDO"
diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
index e41e9e3d1..2a503b9d7 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
@@ -86,8 +86,8 @@ public class BusinessDocumentOrderApplicationService {
         return businessDocumentOrderDomainService.execute(ids);
     }
 
-    public boolean executeAndIssue(List<Long> ids) {
-        return businessDocumentOrderDomainService.executeAndIssue(ids);
+    public boolean executeAndIssue(List<Long> ids,Long  organizationId) {
+        return businessDocumentOrderDomainService.executeAndIssue(ids,organizationId);
     }
 
     public boolean cancelExecute(List<Long> ids) throws Exception{
diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java
index 0752ced4f..59ee652ca 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java
@@ -60,8 +60,8 @@ public class ExecuteOrderApplicationService {
         return executeOrderDomainService.delete(ids);
     }
 
-    public boolean issueDocuments(List<Long> ids) {
-        return executeOrderDomainService.issueDocuments(ids);
+    public boolean issueDocuments(List<Long> ids,Long organizationId) {
+        return executeOrderDomainService.issueDocuments(ids,organizationId);
     }
 
     public boolean cancelIssueDocuments(List<Long> ids) {
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java
index f81f52866..fcb935293 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java
@@ -37,7 +37,7 @@ public interface IBusinessDocumentOrderService extends IService<BusinessDocument
 
     public Boolean execute(List<Long> ids);
 
-    public Boolean executeAndIssue(List<Long> ids);
+    public Boolean executeAndIssue(List<Long> ids,Long organizationId);
 
     public Boolean cancelExecute(List<Long> ids) throws Exception;
 
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 8112bbb5a..c3a0d749f 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
@@ -228,7 +228,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean executeAndIssue(List<Long> ids) {
+    public Boolean executeAndIssue(List<Long> ids,Long organizationId) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         try {
             for (Long id:ids){
@@ -358,6 +358,10 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                             tmsOrderAddDTO.setPayerType(0);
                             tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
                             tmsOrderAddDTO.setOrderSource("0");
+                            tmsOrderAddDTO.setOrganizationId(organizationId);
+                            String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
+
+                            tmsOrderAddDTO.setOrganizationName(orgName);
 
                             AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
                             if(ajaxResult.get("code").toString().equals("200")){
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
index 128db0ecd..0a2a5922b 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
@@ -733,8 +733,8 @@ public class BusinessDocumentOrderDomainService {
         return businessDocumentOrderService.execute(ids);
     }
 
-    public Boolean executeAndIssue(List<Long> ids) {
-        return businessDocumentOrderService.executeAndIssue(ids);
+    public Boolean executeAndIssue(List<Long> ids,Long organizationId) {
+        return businessDocumentOrderService.executeAndIssue(ids,organizationId);
     }
 
     public Boolean cancelExecute(List<Long> ids) throws Exception {
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java
index b7f9f1572..0c031f14c 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java
@@ -35,7 +35,7 @@ public interface IExecuteOrderService extends IService<ExecuteOrder>
      */
     public Boolean delete(Long[] ids);
 
-    public Boolean issueDocuments(List<Long> ids);
+    public Boolean issueDocuments(List<Long> ids,Long organizationId);
 
     public Boolean cancelIssueDocuments(List<Long> ids);
 
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java
index b4763a0eb..c86b88558 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java
@@ -19,4 +19,5 @@ public interface ExecuteOrderMapper extends BaseMapper<ExecuteOrder>
      */
     public List<ExecuteOrderPO> queryList(ExecuteOrderDO executeOrderDO);
 
+    String getOrgNameByOrgId(@Param("organizationId") Long organizationId);
 }
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 b5513168c..f7c409594 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
@@ -117,7 +117,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean issueDocuments(List<Long> ids) {
+    public Boolean issueDocuments(List<Long> ids,Long organizationId) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
             ExecuteOrder  executeOrder=executeOrderMapper.selectById(id);
@@ -203,7 +203,10 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setPayerType(0);
                     tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
                     tmsOrderAddDTO.setOrderSource("0");
-//                    tmsOrderAddDTO.setOrganizationId(organizationId);
+                    tmsOrderAddDTO.setOrganizationId(organizationId);
+                    String orgName = executeOrderMapper.getOrgNameByOrgId(organizationId);
+
+                    tmsOrderAddDTO.setOrganizationName(orgName);
 
                     AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
                     if(ajaxResult.get("code").toString().equals("200")){
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java
index 2f98e4d51..567912f78 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java
@@ -57,8 +57,8 @@ public class ExecuteOrderDomainService {
      * @param ids
      * @return
      */
-  public Boolean issueDocuments(List<Long> ids) {
-        return executeOrderService.issueDocuments(ids);
+  public Boolean issueDocuments(List<Long> ids,Long organizationId) {
+        return executeOrderService.issueDocuments(ids,organizationId);
     }
 
     public Boolean cancelIssueDocuments(List<Long> ids) {
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
index c884f7481..9e15c3e0f 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
@@ -428,4 +428,5 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
     @ApiModelProperty("调整后面积")
     @Excel(name = "调整后面积")
     private BigDecimal adjustedArea;
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessAuditDTO.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessAuditDTO.java
index 026881e02..4de71763d 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessAuditDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessAuditDTO.java
@@ -1,5 +1,6 @@
 package com.mhd.oms.interfaces.dto.businessDocumentAddressMulti;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -18,4 +19,6 @@ public class BusinessAuditDTO {
     private Long reviewStatus;
     private String salesManagerName;
     private String reviewOpinionName;
+    @ApiModelProperty("组织id")
+    private Long organizationId;
 }
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java
index 69b8ad292..12c54c608 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java
@@ -118,7 +118,7 @@ public class BusinessDocumentOrderApi extends BaseController{
     @PostMapping("/executeAndIssue")
     public AjaxResult executeAndIssue(@RequestBody BusinessAuditDTO businessAuditDTO)
     {
-        return toAjax(businessDocumentOrderApplicationService.executeAndIssue(businessAuditDTO.getIds()));
+        return toAjax(businessDocumentOrderApplicationService.executeAndIssue(businessAuditDTO.getIds(),businessAuditDTO.getOrganizationId()));
     }
 
     @ApiOperation("获取业务单的货物内容")
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java
index a66e9e079..6e106cd59 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java
@@ -96,7 +96,7 @@ public class ExecuteOrderApi extends BaseController{
     @PostMapping("/issueDocuments")
     public AjaxResult issueDocuments(@RequestBody BusinessAuditDTO businessAuditDTO)
     {
-        return toAjax(executeOrderApplicationService.issueDocuments(businessAuditDTO.getIds()));
+        return toAjax(executeOrderApplicationService.issueDocuments(businessAuditDTO.getIds(),businessAuditDTO.getOrganizationId()));
     }
 
     /**
diff --git a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
index 92f8beb05..bb2ef2c36 100644
--- a/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
@@ -104,4 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectExecuteOrderPo1"/>
         order by CREATE_TIME desc
     </select>
+    <select id="getOrgNameByOrgId" resultType="java.lang.String">
+        select ORGANIZATION_NAME from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where  ORGANIZATION_ID=#{organizationId}
+    </select>
 </mapper>
\ No newline at end of file