skyouc
1 天以前 3c58f606fb1be6228e8bfdfb0471e4a237d99435
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -297,16 +297,14 @@
                List<StockItem> stockItems = stockItemService.list(new LambdaQueryWrapper<StockItem>()
                        .eq(StockItem::getFieldsIndex, orderItem.getFieldsIndex()));
                //获取库存中订单库位
                if (!stockItems.isEmpty()) {
                    Set<Long> stockIds = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
                    //获取库存库位信息
                    List<Stock> stocks = stockService.list(new LambdaQueryWrapper<Stock>()
                            .in(Stock::getId, stockIds)
                            .eq(Stock::getType, OrderType.ORDER_IN.type)
                            .eq(Stock::getSourceCode, order.getCode()));
                    Set<String> locs = stocks.stream().map(Stock::getLocCode).collect(Collectors.toSet());
                    String locCode = StringUtils.join(locs.toArray(), ",");
                    param.setZone(locCode);
                Set<Long> longSet = stockItems.stream().map(StockItem::getStockId).collect(Collectors.toSet());
                //获取库存库位信息
                Stock stocks = stockService.getOne(new LambdaQueryWrapper<Stock>()
                        .in(Stock::getId, longSet)
                        .eq(Stock::getType, OrderType.ORDER_IN.type)
                        .eq(Stock::getSourceCode, order.getCode()));
                if (!Objects.isNull(stocks)) {
                    param.setZone(stocks.getLocCode());
                }
            }
            //获取索引内容
@@ -332,7 +330,7 @@
                //采购退货
                params.setOrderType("PR_Outstock").setAction("Update");
                param.setOutQty(orderItem.getQty());
            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
            } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
                //调拔入库单
                params.setOrderType("Mv_Instock").setAction("Update");
@@ -370,7 +368,7 @@
        params.setData(reportData);
        try {
            R reported = uploadReportOrders(params);
            if (reported.get("code").equals("200")) {
            if (Integer.valueOf(reported.get("code").toString()) == 200) {
                order.setNtyStatus(OrderReportStatus.ORDER_REPORT_STATUS_ALL.val);
                asnOrderService.updateById(order);
            }