weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oms修改

Browse Source
This commit is contained in:
赵辉
2026-04-21 16:25:52 +08:00
parent 9a39d329e6
commit e667f22564
15 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+1
View File
@@ -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"
mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java
+2 -2
View File
@@ -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{
mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java
+2 -2
View File
@@ -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) {
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java
+1 -1
View File
@@ -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;
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java
+5 -1
View File
@@ -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")){
mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java
+2 -2
View File
@@ -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 {
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java
+1 -1
View File
@@ -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);
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/mapper/ExecuteOrderMapper.java
+1
View File
@@ -19,4 +19,5 @@ public interface ExecuteOrderMapper extends BaseMapper<ExecuteOrder>
*/
public List<ExecuteOrderPO> queryList(ExecuteOrderDO executeOrderDO);
String getOrgNameByOrgId(@Param("organizationId") Long organizationId);
}
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java
+5 -2
View File
@@ -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")){
mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java
+2 -2
View File
@@ -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) {
mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java
+1
View File
@@ -428,4 +428,5 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
@ApiModelProperty("调整后面积")
@Excel(name = "调整后面积")
private BigDecimal adjustedArea;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessAuditDTO.java
+3
View File
@@ -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;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java
+1 -1
View File
@@ -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("获取业务单的货物内容")
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java
+1 -1
View File
@@ -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()));
}
/**
mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml
+3
View File
@@ -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>