oms修改

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java

@@ -8,11 +8,11 @@ import com.mhd.oms.domain.businessDocumentOrder.service.BusinessDocumentOrderDom
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
 import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper;
+import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessAuditDTO;
 import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -78,19 +78,19 @@ public class BusinessDocumentOrderApplicationService {
         return businessDocumentOrderDomainService.getInfo(id);
     }
 
-    public Boolean audit( Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion)
+    public Boolean audit(BusinessAuditDTO businessAuditDTO)
     {
-        return businessDocumentOrderDomainService.audit(ids,reviewStatus,SalesManager,reviewOpinion);
+        return businessDocumentOrderDomainService.audit(businessAuditDTO);
     }
-    public boolean execute(Long[] ids) {
+    public boolean execute(List<Long> ids) {
         return businessDocumentOrderDomainService.execute(ids);
     }
 
-    public boolean executeAndIssue(Long[] ids) {
+    public boolean executeAndIssue(List<Long> ids) {
         return businessDocumentOrderDomainService.executeAndIssue(ids);
     }
 
-    public boolean cancelExecute(Long[] ids) throws Exception{
+    public boolean cancelExecute(List<Long> ids) throws Exception{
         return businessDocumentOrderDomainService.cancelExecute(ids);
     }
 

mhd_oms/src/main/java/com/mhd/oms/application/service/executeOrder/ExecuteOrderApplicationService.java

@@ -60,11 +60,11 @@ public class ExecuteOrderApplicationService {
         return executeOrderDomainService.delete(ids);
     }
 
-    public boolean issueDocuments(Long[] ids) {
+    public boolean issueDocuments(List<Long> ids) {
         return executeOrderDomainService.issueDocuments(ids);
     }
 
-    public boolean cancelIssueDocuments(Long[] ids) {
+    public boolean cancelIssueDocuments(List<Long> ids) {
         return executeOrderDomainService.cancelIssueDocuments(ids);
     }
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/facade/IBusinessDocumentOrderService.java

@@ -35,11 +35,11 @@ public interface IBusinessDocumentOrderService extends IService<BusinessDocument
      */
     public Boolean delete(Long[] ids);
 
-    public Boolean execute(Long[] ids);
+    public Boolean execute(List<Long> ids);
 
-    public Boolean executeAndIssue(Long[] ids);
+    public Boolean executeAndIssue(List<Long> ids);
 
-    public Boolean cancelExecute(Long[] ids) throws Exception;
+    public Boolean cancelExecute(List<Long> ids) throws Exception;
 
 
     /**
@@ -47,7 +47,7 @@ public interface IBusinessDocumentOrderService extends IService<BusinessDocument
      */
     public BusinessDocumentOrderPO getInfo(Long id);
 
-    public Boolean audit( Long [] ids, Long reviewStatus, String SalesManager,String reviewOpinion);
+    public Boolean audit( List<Long> ids, Long reviewStatus, String SalesManager,String reviewOpinion);
 
     String selectByMakerCodeNc(String salesmanCodeNc);
 

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -144,7 +144,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
     }
 
     @Override
-    public Boolean audit(Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion ) {
+    public Boolean audit(List<Long> ids, Long reviewStatus, String SalesManager,String reviewOpinion ) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
             BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id);
@@ -171,7 +171,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean execute(Long[] ids) {
+    public Boolean execute(List<Long> ids) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         try {
             for (Long id:ids){
@@ -228,7 +228,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean executeAndIssue(Long[] ids) {
+    public Boolean executeAndIssue(List<Long> ids) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         try {
             for (Long id:ids){
@@ -392,7 +392,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean cancelExecute(Long[] ids) throws Exception{
+    public Boolean cancelExecute(List<Long> ids) throws Exception{
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
             BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id);

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java

@@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mhd.common.core.domain.po.UserShipperPo;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.security.utils.SecurityUtils;
@@ -20,7 +19,7 @@ import com.mhd.oms.domain.businessDocumentOrder.repository.po.BusinessDocumentOr
 import com.mhd.oms.domain.businessDocumentOrder.repository.todo.BusinessDocumentOrderDO;
 import com.mhd.oms.domain.businessOrderAccount.BusinessOrderAccount;
 import com.mhd.oms.domain.businessOrderAccount.repository.mapper.BusinessOrderAccountMapper;
-import com.mhd.oms.domain.orderType.entity.OrderType;
+import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessAuditDTO;
 import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessDocumentAddressMultiDTO;
 import com.mhd.oms.interfaces.dto.businessDocumentCargoMulti.BusinessDocumentCargoMultiDTO;
 import com.mhd.oms.util.DictDataUtils;
@@ -32,7 +31,6 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -726,20 +724,20 @@ public class BusinessDocumentOrderDomainService {
         return businessDocumentOrderService.getInfo(id);
     }
 
-    public Boolean audit( Long[] ids, Long reviewStatus, String SalesManager,String reviewOpinion)
+    public Boolean audit(BusinessAuditDTO businessAuditDTO)
     {
 
-        return businessDocumentOrderService.audit(ids,reviewStatus,SalesManager,reviewOpinion);
+        return businessDocumentOrderService.audit(businessAuditDTO.getIds(),businessAuditDTO.getReviewStatus(),businessAuditDTO.getSalesManager(),businessAuditDTO.getReviewOpinion());
     }
-    public Boolean execute(Long[] ids) {
+    public Boolean execute(List<Long> ids) {
         return businessDocumentOrderService.execute(ids);
     }
 
-    public Boolean executeAndIssue(Long[] ids) {
+    public Boolean executeAndIssue(List<Long> ids) {
         return businessDocumentOrderService.executeAndIssue(ids);
     }
 
-    public Boolean cancelExecute(Long[] ids) throws Exception {
+    public Boolean cancelExecute(List<Long> ids) throws Exception {
         return businessDocumentOrderService.cancelExecute(ids);
     }
 

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/facade/IExecuteOrderService.java

@@ -35,9 +35,9 @@ public interface IExecuteOrderService extends IService<ExecuteOrder>
      */
     public Boolean delete(Long[] ids);
 
-    public Boolean issueDocuments(Long[] ids);
+    public Boolean issueDocuments(List<Long> ids);
 
-    public Boolean cancelIssueDocuments(Long[] ids);
+    public Boolean cancelIssueDocuments(List<Long> ids);
 
 
     /**

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(Long[] ids) {
+    public Boolean issueDocuments(List<Long> ids) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
             ExecuteOrder  executeOrder=executeOrderMapper.selectById(id);
@@ -223,7 +223,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                             }
 
                         }
-                        return true;
+
 
                     }else {
                         throw  new ServiceException(ajaxResult.get("msg").toString());
@@ -231,12 +231,12 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                 }
             }
         }
-        return null;
+       return true;
     }
 
     @Override
     @Transactional
-    public Boolean cancelIssueDocuments(Long[] ids) {
+    public Boolean cancelIssueDocuments(List<Long> ids) {
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
             ExecuteOrder  executeOrder=executeOrderMapper.selectById(id);

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java

@@ -57,11 +57,11 @@ public class ExecuteOrderDomainService {
      * @param ids
      * @return
      */
-  public Boolean issueDocuments(Long[] ids) {
+  public Boolean issueDocuments(List<Long> ids) {
         return executeOrderService.issueDocuments(ids);
     }
 
-    public Boolean cancelIssueDocuments(Long[] ids) {
+    public Boolean cancelIssueDocuments(List<Long> ids) {
         return executeOrderService.cancelIssueDocuments(ids);
     }
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentAddressMulti/BusinessAuditDTO.java

@@ -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

@@ -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")
+    @PostMapping(value = "/audit")
-    public AjaxResult audit(@RequestParam("ids") Long[] ids,@RequestParam("reviewStatus") Long reviewStatus,@RequestParam("salesManager") String salesManager,@RequestParam("reviewOpinion") String reviewOpinion)
+    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

@@ -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("获取当前登录人信息")