From d7355ce983c2bddcc5b95e4d84283f6631fb176a Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 27 十一月 2025 13:38:46 +0800
Subject: [PATCH] 修改入出库历史的拣料类型，不上传ERP
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 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 4f31915..a01bca4 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
@@ -386,8 +386,14 @@
if (stockItems.isEmpty()) {
return;
}
+ 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<Long> list = stockList.stream().map(Stock::getId).collect(Collectors.toList());
+ List<StockItem> stockItems1 = stockItemService.list(new LambdaQueryWrapper<StockItem>().eq(StockItem::getStockId, list));
String finalNickName = nickName;
- stockItems.forEach(stockItem -> {
+ stockItems1.forEach(stockItem -> {
List<ReportDataParam> dataParams = new ArrayList<>();
//鑾峰彇绱㈠紩鍐呭
Map<String, String> fields = FieldsUtils.getFields(stockItem.getFieldsIndex());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 43a111b..e6ecd8a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -756,7 +756,7 @@
TaskItem taskItem = taskItems.stream().findFirst().get();
//淇濆瓨鍏ュ嚭搴撴祦姘�
- saveStockItems(taskItems, task, null, null, taskItem.getWkType(), taskItem.getOrderType(), loginUserId);
+ saveStockItems(taskItems, task, null, null, taskItem.getWkType(), OrderType.ORDER_IN.type, loginUserId);
locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
--
Gitblit v1.9.1