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'
ids) {
- return businessDocumentOrderDomainService.executeAndIssue(ids);
+ public boolean executeAndIssue(List ids,Long organizationId) {
+ return businessDocumentOrderDomainService.executeAndIssue(ids,organizationId);
}
public boolean cancelExecute(List 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 ids) {
- return executeOrderDomainService.issueDocuments(ids);
+ public boolean issueDocuments(List ids,Long organizationId) {
+ return executeOrderDomainService.issueDocuments(ids,organizationId);
}
public boolean cancelIssueDocuments(List 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 ids);
- public Boolean executeAndIssue(List ids);
+ public Boolean executeAndIssue(List ids,Long organizationId);
public Boolean cancelExecute(List 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 ids) {
+ public Boolean executeAndIssue(List ids,Long organizationId) {
LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
try {
for (Long id:ids){
@@ -358,6 +358,10 @@ public class BusinessDocumentOrderImpl extends ServiceImpl ids) {
- return businessDocumentOrderService.executeAndIssue(ids);
+ public Boolean executeAndIssue(List ids,Long organizationId) {
+ return businessDocumentOrderService.executeAndIssue(ids,organizationId);
}
public Boolean cancelExecute(List 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
*/
public Boolean delete(Long[] ids);
- public Boolean issueDocuments(List ids);
+ public Boolean issueDocuments(List ids,Long organizationId);
public Boolean cancelIssueDocuments(List 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
*/
public List 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 ids) {
+ public Boolean issueDocuments(List 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 ids) {
- return executeOrderService.issueDocuments(ids);
+ public Boolean issueDocuments(List ids,Long organizationId) {
+ return executeOrderService.issueDocuments(ids,organizationId);
}
public Boolean cancelIssueDocuments(List 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"
order by CREATE_TIME desc
+
+ select ORGANIZATION_NAME from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where ORGANIZATION_ID=#{organizationId}
+
\ No newline at end of file