审批申请拦截重复提交

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/approval/OrderApprovalMapper.java

@@ -100,7 +100,7 @@ public interface OrderApprovalMapper extends AbstractMapper<OrderApprovalDO> {
     OrderApprovalDO itemApprovalCount(@Param("orderItemId") Long orderItemId, @Param("orderId") Long orderId, @Param("types") List<Integer> types);
 
 
-    @ResultType(OrderSpecialApplyVO.class)
+    @ResultType(Integer.class)
     @Select({
             "<script>",
             "select",

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderCargoControl/OrderCargoControlServiceImpl.java

@@ -607,6 +607,11 @@ public class OrderCargoControlServiceImpl extends AbstractService<OrderCargoCont
         }
         Date now = new Date();
         OrderDO orderDO = orderService.getById(orderCargoControlApplyVO.getOrderId());
+        // TODO 待确认具体拦截哪些审批任务
+        int count = orderApprovalMapper.processingItemApproval(null, orderCargoControlApplyVO.getOrderId(), Arrays.asList(orderCargoControlApplyVO.getApplyType(), 14));
+        if (count > 0){
+            throw exception(ORDER_IS_APPROVAL_IN_PROCESS);
+        }
         OrderCargoControlReleaseInfoDto releaseInfoDto = this.getOrderCargoControlReleaseInfo(orderCargoControlApplyVO.getOrderId());
         orderCargoControlApplyVO.setOrderNo(releaseInfoDto.getOrderNo());
         orderCargoControlApplyVO.setPickQuantity(releaseInfoDto.getPickQuantity());

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/orderCargoControl/OrderCargoControlController.java

@@ -146,6 +146,7 @@ public class OrderCargoControlController {
 
     @PutMapping("/update/apply")
     @ApiOperation("控货业务审批申请")
+    @Idempotent(timeout = 10)
     public CommonResult<Boolean> orderCargoControlApply(@Valid @RequestBody OrderCargoControlApplyVO orderCargoControlApplyVO) {
         orderCargoControlService.orderCargoControlApply(orderCargoControlApplyVO);
         return success(true);