调拔单功能优化

skyouc

3 天以前 951b46befc5b4ec669f882bebd934d64897059f9

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -46,6 +46,8 @@
    private AsnOrderItemLogService asnOrderItemLogService;
    @Autowired
    private TransferOrderService transferOrderService;
    @Autowired
    private TransferService transferService;

    /**
     * @param
@@ -155,19 +157,23 @@
                        if (!asnOrderService.updateById(order)) {
                            throw new CoolException("单据状态更新失败！！");
                        }

                        List<TransferOrder> orders = transferOrderService.list(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getTransferId, order.getPoId()));
                        if (orders.isEmpty()) {
                            throw new CoolException("数据错误：关联表信息不存在！！");
                        }
                        Set<Long> orderIds = orders.stream().map(TransferOrder::getOrderId).collect(Collectors.toSet());
                        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                                .in(WkOrderItem::getOrderId, orderIds))) {
                            throw new CoolException("原单据明细删除失败！！");
                        }
                        if (!this.asnOrderService.removeByIds(orderIds)) {
                            throw new CoolException("原单据删除失败！！");
                        }
//                        List<TransferOrder> orders = transferOrderService.list(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getTransferId, order.getPoId()));
//                        if (orders.isEmpty()) {
//                            throw new CoolException("数据错误：关联表信息不存在！！");
//                        }
//                        Set<Long> orderIds = orders.stream().map(TransferOrder::getOrderId).collect(Collectors.toSet());
//                        if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
//                                .in(WkOrderItem::getOrderId, orderIds))) {
//                            throw new CoolException("原单据明细删除失败！！");
//                        }
//                        if (!this.asnOrderService.removeByIds(orderIds)) {
//                            throw new CoolException("原单据删除失败！！");
//                        }
                          if (!transferService.update(new LambdaUpdateWrapper<Transfer>()
                                  .eq(Transfer::getId, order.getPoId())
                                  .set(Transfer::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val))) {
                              throw new CoolException("调拔单状态修改失败！！");
                          }
                        return;
                    } else {
                        if (!Objects.isNull(order.getPoId())) {
@@ -182,7 +188,7 @@
                        if (!asnOrderService.updateById(order)) {
                            throw new CoolException("单据状态更新失败！！");
                        }
                        //如果为调拔单执行完成，需检查调拔入库单是否完成，完成后才能删除单据信息
                        //如果为调拔单据保留
                        return;
                    } else {
                        if (!Objects.isNull(order.getPoId())) {