1. 拣料出库不换库位 2. 缓存代码优化 3. 库存按批次先进先出

skyouc

2 天以前 d36f413965c4ef2ea35a7e0ecefd32001a1e66f8

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java

@@ -277,6 +277,7 @@
     * @version 1.0
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void reportOrders(WkOrder order) {
        ReportParams params = new ReportParams();
        List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
@@ -369,7 +370,7 @@
                try {
                    R reported = uploadReportOrders(params);
                    if (Integer.valueOf(reported.get("code").toString()) == 200) {
                        order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
                        order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val).setReportOnce(5);
                        asnOrderService.updateById(order);
                    }
                } catch (Exception e) {
@@ -377,7 +378,7 @@
                }
                try {
                    //休眠3秒
                    Thread.sleep(3000);
                    Thread.sleep(300);
                } catch (InterruptedException e) {
                    throw new RuntimeException(e);
                }
@@ -389,7 +390,7 @@
                Set<Long> stockIds = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
                List<Stock> stocks = stockService.listByIds(stockIds);
                //过滤拣货入库明细，避免上报
                List<Stock> stockList = stocks.stream().filter(stock -> stock.getType().equals(OrderType.ORDER_OUT.type)).collect(Collectors.toList());
                List<Stock> stockList = stocks.stream().filter(stock -> stock.getType().equals(OrderType.ORDER_OUT.type) && !Objects.isNull(stock.getSourceCode())).collect(Collectors.toList());
                List<Long> list = stockList.stream().map(Stock::getId).collect(Collectors.toList());
                List<StockItem> stockItems1 = stockItemService.list(new LambdaQueryWrapper<StockItem>().in(StockItem::getStockId, list));
                String finalNickName = nickName;
@@ -461,7 +462,7 @@
                    }
                    try {
                        //休眠3秒
                        Thread.sleep(3000);
                        Thread.sleep(300);
                    } catch (InterruptedException e) {
                        throw new RuntimeException(e);
                    }
@@ -497,7 +498,7 @@
            List<StockItem> stockItems = stockItemService.list(new LambdaQueryWrapper<StockItem>()
                    .eq(StockItem::getFieldsIndex, orderItem.getFieldsIndex()));
            //获取库存中订单库位
            Set<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
            List<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toList());
            //获取库存库位信息
            Stock stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
                    .in(Stock::getId, longSet)
@@ -578,7 +579,7 @@

        try {
            //休眠3秒
            Thread.sleep(3000);
            Thread.sleep(300);
        } catch (InterruptedException e) {
            throw new RuntimeException(e);
        }