From a6bded7b9d51de21220989b7f9789ede8315908a Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 04 十二月 2025 11:14:28 +0800
Subject: [PATCH] 上报间隔优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 56a5de0..17e963f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/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);
                 //杩囨护鎷h揣鍏ュ簱鏄庣粏锛岄伩鍏嶄笂鎶�
-                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);
         }

--
Gitblit v1.9.1