fix:修改删除生产科对账单时校验一下是否存在待审核的发票。

chenhang4442024
1 parent c3c2734f
Showing 1 changed file with 7 additions and 5 deletions
src/main/java/com/order/erp/service/order/impl/ProducePaymentCheckBillOrderServiceImpl.java
@@ -987,7 +987,7 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
         }
         OrderBaseInfoDO orderBaseInfoDO = orderBaseInfoService.getById(checkBillOrderDO.getOrderId());
         //校验是否有处于待审核的发票。
-        checkCommitApply(id);
+        checkCommitApply(Arrays.asList(id));
         //校验是否有处于待审核的订单。 todo
         checkApply(new ArrayList<>(Arrays.asList(id)));
         OrderLockFieldVO locakFieldVO = new OrderLockFieldVO();
@@ -1181,16 +1181,16 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
     }
  
     /**
-     * @param id
+     * @param ids
      */
-    private void checkCommitApply(Long id) {
+    private void checkCommitApply(List<Long> ids) {
         OrderFieldLockApplyDO applyDO = orderFieldLockApplyService.getOne(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
                 .eq(OrderFieldLockApplyDO::getEnableFlag, Constant.ENABLE_TEN)
                 .eq(OrderFieldLockApplyDO::getType, ApplyTypeEnum.DEPARTMENT_INVOICE_APPLY.getType())
                 .eq(OrderFieldLockApplyDO::getStatus, ApplyStatusEnum.WAIT_AUDIT.getStatus())
-                .eq(OrderFieldLockApplyDO::getOrderId, id));
+                .in(OrderFieldLockApplyDO::getOrderId, ids));
         if (Objects.nonNull(applyDO)) {
-            throw new BusinessException("该账单发票还在审批中，请联系总经理审批后操作！");
+            throw new BusinessException("该账单发票还在审批中，请联系总经理审批后再执行操作！");
         }
     }
  
@@ -1236,6 +1236,8 @@ public class ProducePaymentCheckBillOrderServiceImpl extends ServiceImpl&lt;Produce
             }
             //todo 审核有点问题。审核时是是哪个orderid共用一个orderid作为id,查询的时候是只能查询到第一个。  已完成。
         checkApply(ids);
+         //查询一下是否存在待审核的发票。如果存在待审核的发票就目前无法删除。
+        checkCommitApply(ids);
         List<Long> orderIds = checkBillOrderDOS.stream()
                 .map(ProducePaymentCheckBillOrderDO::getOrderId)
                 .collect(Collectors.toList());