修改 1. 新增库位明细流界面 2. 修改库存信息表

skyouc

2025-04-15 9c0236bacbd10fb629a4142719c4199bca1038bc

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -53,6 +53,14 @@
    @Autowired
    private DeviceSiteService deviceSiteService;

    @Autowired
    private OrderService orderService;

    @Autowired
    private OrderItemService orderItemService;

    @Autowired
    private LocItemService locItemService;


    /**
@@ -113,8 +121,13 @@
            waitPakinItems.forEach(item -> {
                TaskItem taskItem = new TaskItem();
                BeanUtils.copyProperties(item, taskItem);
                AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getId, item.getAsnId()));
                if (Objects.isNull(order)) {
                    throw new CoolException("单据不存在！！");
                }
                taskItem.setTaskId(task.getId())
                        .setOrderType(OrderType.ORDER_RECEIPT.type)
                        .setWkType(Short.parseShort(order.getWkType()))
                        .setSource(item.getId())
                        .setTrackCode(item.getTrackCode())
                        .setCreateBy(loginUserId)
@@ -139,7 +152,7 @@
    }

    /**
     * 完成任务
     * 完成任务 更新库位明细信息，将单据库存更新到单据库存表
     * @param tasks
     * @throws Exception
     */
@@ -152,59 +165,36 @@
        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("任务明细不能为空！！");
            throw new CoolException("任务明细不存在！！");
        }
        List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
        Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
        /**对任务明细按任务主单进行分组*/
        listMap.keySet().forEach(key -> {
            List<TaskItem> items = listMap.get(key);
            //更新库位明细
            try {
                saveLocItem(items, key);
            } catch (Exception e) {
                throw new CoolException("库位明细更新失败！！");
            }
        });

        /**对任务明细按订单进行分组*/
        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()));
                if (!Objects.isNull(purchase)) {
                    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 = this.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("库存修改架失败！！");
            //保存库存明细
            try {
                saveStockItems(items, order);
            } catch (Exception e) {
                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("库位状态修改失败！！");
        }
@@ -212,4 +202,96 @@
            throw new CoolException("任务状态修改失败！！");
        }
    }

    /**
     * @author Ryan
     * @description 更新库位明细
     * @param
     * @return
     * @time 2025/4/15 15:28
     */
    @Transactional(rollbackFor = Exception.class)
    private void saveLocItem(List<TaskItem> items, Long taskId) throws Exception {
        Task task = this.getById(taskId);
        if (Objects.isNull(task)) {
            throw new CoolException("任务不存在!!");
        }
        List<LocItem> locItems = new ArrayList<>();
        items.forEach(taskItem -> {
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
            LocItem item = new LocItem();
            BeanUtils.copyProperties(taskItem, item);
            item.setLocId(loc.getId()).setType(taskItem.getOrderType());
            locItems.add(item);
        });
        if (!locItemService.saveBatch(locItems)) {
            throw new CoolException("库位明细更新失败！！");
        }
    }

    /**
     * 生成库存明细
     * @param items
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    private void saveStockItems(List<TaskItem> items, AsnOrder order) throws Exception {
        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()));
//            if (!Objects.isNull(purchase)) {
//                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.setSourceId(order.getId()).setSourceCode(order.getCode());
        if (!stockService.save(stock)) {
            throw new CoolException("库存保存失败！！");
        }

        List<StockItem> stockItems = new ArrayList<>();
        for (TaskItem item : items) {
            /**通过任务明细中的taskId查询,获取TASK的目标库位信息*/
            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.setSourceItemId(item.getOrderItemId())
                    .setStockCode(stock.getCode())
                    .setSourceItemId(orderItem.getId())
                    .setId(null)
                    .setStockId(stock.getId());
            stockItems.add(stockItem);
        }
        if (!stockItemService.saveBatch(stockItems)) {
            throw new CoolException("库存修改架失败！！");
        }
    }

//    public void generateOrders() {
//        Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
//        listMap.keySet().forEach(key -> {
//            double sum = listMap.get(key).stream().mapToDouble(TaskItem::getAnfme).sum();
//            listMap.get(key).forEach(taskItem -> {
//                Order order = new Order();
//                String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_MANAGE_ORDER_CODE, taskItem);
//                if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
//                    throw new CoolException("编码规则错误：" + "请查看编码：" + "「SYS_MANAGE_ORDER_CODE」" + "是否设置");
//                }
//                order.setCode(ruleCode).setAnfme(sum).setSourceId(taskItem.getOrderId());
//            });
//        });
//
//        if (!orderItemService.saveBatch(orderItems)) {
//            throw new CoolException("单据明细保存失败！！");
//        }
//    }



}