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-20 21:48:21 +08:00
parent 209d87409e
commit 9a5e63e6f0
11 changed files with 67 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessAuditDTO.java
+21
View File
@@ -0,0 +1,21 @@
package com.mhd.oms.interfaces.dto.businessDocumentAddressMulti;
import lombok.Data;
import java.util.List;
/**
* @author: brb
* @description:
* @create: 2026-04-20 21:14
*/
@Data
public class BusinessAuditDTO {
private List<Long> ids;
private String salesManager;
private String reviewOpinion;
private Long reviewStatus;
private String salesManagerName;
private String reviewOpinionName;
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java
+11 -10
View File
@@ -2,6 +2,7 @@ package com.mhd.oms.interfaces.facade.businessDocumentOrder;
import java.util.List;
import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessAuditDTO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -74,7 +75,7 @@ public class BusinessDocumentOrderApi extends BaseController{
* 批量删除【业务单】
*/
@ApiOperation("批量删除【业务单】")
@DeleteMapping("/deleteByIds/{ids}")
@PostMapping("/deleteByIds/{ids}")
public AjaxResult delete(@PathVariable Long[] ids)
{
return toAjax(businessDocumentOrderApplicationService.delete(ids));
@@ -94,10 +95,10 @@ public class BusinessDocumentOrderApi extends BaseController{
* 业务单审核
*/
@ApiOperation("业务单审核")
@GetMapping(value = "/audit")
public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus,@RequestParam("salesManager") String salesManager,@RequestParam("reviewOpinion") String reviewOpinion)
@PostMapping(value = "/audit")
public AjaxResult audit(@RequestBody BusinessAuditDTO businessAuditDTO)
{
return AjaxResult.success(businessDocumentOrderApplicationService.audit(ids,reviewStatus,salesManager,reviewOpinion));
return AjaxResult.success(businessDocumentOrderApplicationService.audit(businessAuditDTO));
}
/**
@@ -105,9 +106,9 @@ public class BusinessDocumentOrderApi extends BaseController{
*/
@ApiOperation("批量执行【业务单】")
@PostMapping("/execute")
public AjaxResult execute(@RequestParam("ids") Long[] ids)
public AjaxResult execute(@RequestBody BusinessAuditDTO businessAuditDTO)
{
return toAjax(businessDocumentOrderApplicationService.execute(ids));
return toAjax(businessDocumentOrderApplicationService.execute(businessAuditDTO.getIds()));
}
/**
@@ -115,9 +116,9 @@ public class BusinessDocumentOrderApi extends BaseController{
*/
@ApiOperation("批量执行并下发【业务单】")
@PostMapping("/executeAndIssue")
public AjaxResult executeAndIssue(@RequestParam("ids") Long[] ids)
public AjaxResult executeAndIssue(@RequestBody BusinessAuditDTO businessAuditDTO)
{
return toAjax(businessDocumentOrderApplicationService.executeAndIssue(ids));
return toAjax(businessDocumentOrderApplicationService.executeAndIssue(businessAuditDTO.getIds()));
}
@ApiOperation("获取业务单的货物内容")
@@ -134,9 +135,9 @@ public class BusinessDocumentOrderApi extends BaseController{
*/
@ApiOperation("批量取消执行【业务单】")
@PostMapping("/cancelExecute")
public AjaxResult cancelExecute(@RequestParam("ids") Long[] ids) throws Exception {
public AjaxResult cancelExecute(@RequestBody BusinessAuditDTO businessAuditDTO) throws Exception {
try {
return toAjax(businessDocumentOrderApplicationService.cancelExecute(ids));
return toAjax(businessDocumentOrderApplicationService.cancelExecute(businessAuditDTO.getIds()));
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.error(e.getMessage());
mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java
+5 -4
View File
@@ -4,6 +4,7 @@ import java.util.List;
import com.github.pagehelper.PageHelper;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessAuditDTO;
import com.mhd.system.api.model.LoginUser;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -93,9 +94,9 @@ public class ExecuteOrderApi extends BaseController{
*/
@ApiOperation("批量下发【执行单】")
@PostMapping("/issueDocuments")
public AjaxResult issueDocuments(@RequestParam("ids") Long[] ids)
public AjaxResult issueDocuments(@RequestBody BusinessAuditDTO businessAuditDTO)
{
return toAjax(executeOrderApplicationService.issueDocuments(ids));
return toAjax(executeOrderApplicationService.issueDocuments(businessAuditDTO.getIds()));
}
/**
@@ -103,9 +104,9 @@ public class ExecuteOrderApi extends BaseController{
*/
@ApiOperation("批量取消下发【执行单】")
@PostMapping("/cancelIssueDocuments")
public AjaxResult cancelIssueDocuments(@RequestParam("ids") Long[] ids)
public AjaxResult cancelIssueDocuments(@RequestBody BusinessAuditDTO businessAuditDTO)
{
return toAjax(executeOrderApplicationService.cancelIssueDocuments(ids));
return toAjax(executeOrderApplicationService.cancelIssueDocuments(businessAuditDTO.getIds()));
}
@ApiOperation("获取当前登录人信息")