执行单取消下发

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java

@@ -526,4 +526,7 @@ public interface WlhyServiceFeign {
      */
     @PostMapping("/feign/order/add")
     public AjaxResult add(@RequestBody TmsOrderAddDTO tmsOrderAddDTO);
+
+    @GetMapping("/feign/order/cancelIssueDocuments")
+    public AjaxResult cancelIssueDocuments(@RequestParam(name="executeOrderId") String executeOrderId);
 }

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java

@@ -528,6 +528,11 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
             public AjaxResult add(TmsOrderAddDTO tmsOrderAddDTO) {
                 return AjaxResult.error(cause.getMessage());
             }
+
+            @Override
+            public AjaxResult cancelIssueDocuments(String executeOrderId) {
+                return AjaxResult.error(cause.getMessage());
+            }
         };
     }
 }

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

@@ -64,6 +64,10 @@ public class ExecuteOrderApplicationService {
         return executeOrderDomainService.issueDocuments(ids);
     }
 
+    public boolean cancelIssueDocuments(Long[] ids) {
+        return executeOrderDomainService.cancelIssueDocuments(ids);
+    }
+
     /**
      * 获取【请填写功能名称】详细信息
      */

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

@@ -37,6 +37,8 @@ public interface IExecuteOrderService extends IService<ExecuteOrder>
 
     public Boolean issueDocuments(Long[] ids);
 
+    public Boolean cancelIssueDocuments(Long[] ids);
+
 
     /**
      * 查询【请填写功能名称】

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -166,6 +167,31 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
         return null;
     }
 
+    @Override
+    @Transactional
+    public Boolean cancelIssueDocuments(Long[] ids) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
+        for (Long id:ids){
+            ExecuteOrder  executeOrder=executeOrderMapper.selectById(id);
+            if (ObjectUtil.isNotNull(executeOrder)){
+                executeOrder.setIssueStatus(1L);
+                /*executeOrder.setIssueTime(new Date());
+                executeOrder.setIssueId(loginUser.getUserid());
+                executeOrder.setIssueName(loginUser.getUsername());*/
+                executeOrder.setOrderStatus(3L);
+                //取消下发到tms
+                AjaxResult ajaxResult=wlhyServiceFeign.cancelIssueDocuments(String.valueOf(id));
+                if(ajaxResult.get("code").toString().equals("200")){
+                    executeOrderMapper.updateById(executeOrder);
+                }else {
+                    throw  new ServiceException(ajaxResult.get("msg").toString());
+                }
+
+            }
+        }
+        return null;
+    }
+
 
 
 

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

@@ -55,6 +55,10 @@ public class ExecuteOrderDomainService {
         return executeOrderService.issueDocuments(ids);
     }
 
+    public Boolean cancelIssueDocuments(Long[] ids) {
+        return executeOrderService.cancelIssueDocuments(ids);
+    }
+
     /**
      * 获取【请填写功能名称】详细信息
      */

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java

@@ -92,6 +92,15 @@ public class ExecuteOrderApi extends BaseController{
         return toAjax(executeOrderApplicationService.issueDocuments(ids));
     }
 
+    /**
+     * 批量取消下发【执行单】
+     */
+    @ApiOperation("批量取消下发【执行单】")
+    @PostMapping("/cancelIssueDocuments")
+    public AjaxResult cancelIssueDocuments(@RequestParam("ids") Long[] ids)
+    {
+        return toAjax(executeOrderApplicationService.cancelIssueDocuments(ids));
+    }