rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -56,68 +56,11 @@
    @Scheduled(cron = "0 0/05 * * * ?  ")
//  @Scheduled(cron = "0/5 * * * * ?")
    @Transactional(rollbackFor = Exception.class)
    public void completeInStock() {
    public void completeInStock() throws Exception {
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
        if (tasks.isEmpty()) {
            return;
        }
        List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, list));
        if (taskItems.isEmpty()) {
            throw new CoolException("任务明细为空!!");
        taskService.completeTask(tasks);
        }
        /**对任务明细按订单进行分组*/
        Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
        List<StockItem> stockItems = new ArrayList<>();
        orderMap.keySet().forEach(key -> {
            AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
                    .eq(AsnOrder::getId, key)
                    .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
            Stock stock = new Stock();
            if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
                Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
                stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
            }
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
            if (StringUtils.isBlank(ruleCode)) {
                throw new CoolException("当前业务:" + SerialRuleCode.SYS_STOCK_CODE + ",编码规则不存在!!");
            }
            stock.setAsnId(order.getId()).setAsnCode(order.getCode());
            if (!stockService.save(stock)) {
                throw new CoolException("库存保存失败!!");
            }
            List<TaskItem> items = orderMap.get(key);
            for (TaskItem item : items) {
                /**通过任务明细中的taskId查询,获取TASK的目标库位信息*/
                Task taskServiceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
                        .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode)
                        .eq(Task::getId, item.getTaskId()));
                Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc()));
                if (Objects.isNull(loc)) {
                    throw new CoolException("库位不存在!!");
                }
                AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
                if (Objects.isNull(orderItem)) {
                    throw new CoolException("单据明细不存在!!");
                }
                StockItem stockItem = new StockItem();
                BeanUtils.copyProperties(orderItem, stockItem);
                stockItem.setAsnItemId(item.getOrderItemId())
                        .setBarcode(taskServiceOne.getBarcode())
                        .setLocId(loc.getId())
                        .setId(null)
                        .setStockId(stock.getId());
                stockItems.add(stockItem);
            }
            if (!stockItemService.saveBatch(stockItems)) {
                throw new CoolException("库存修改架失败!!");
            }
        });
        /**修改库位状态为F.在库*/
        List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
        if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
            throw new CoolException("库位状态修改失败!!");
        }
    }
}