From e6d3803d1bafb782c0907fa925ec110932bc3f23 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 25 二月 2026 14:46:34 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 0cb4583..67eefb8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -18,6 +18,8 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
+import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
+import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.controller.params.PakinItem;
import com.vincent.rsf.server.manager.controller.params.WaitPakinParam;
@@ -552,19 +554,13 @@
if (!Cools.isEmpty(palletId.get()) && StringUtils.isNotBlank(syncOrder.getOrderNo()) && !Cools.isEmpty(syncOrder.getStationId())) {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, palletId.get()));
if (!Cools.isEmpty(loc)) {
+// outStockService.getOrderOutTaskItem(orderOutTaskParam,param.getOrderItemId());
//鍑哄簱
- List<OutStockToTaskParams> param = new ArrayList<>();
- for (WkOrderItem wkOrderItem : orderItems){
- OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(wkOrderItem);
- outStockToTaskParams.setLocCode(loc.getCode());
- outStockToTaskParams.setSiteNo(syncOrder.getStationId());
- param.add(outStockToTaskParams);
- }
// boolean itemsCheck = waitPakinService.mergeItemsCheck(pakinParam, loginUserId);
// if (true) {
CompletableFuture.runAsync(() -> {
try {
- asyncOutboundExecutionWcs(param, wkOrder.getId(), loginUserId);
+ asyncOutboundExecutionWcs(syncOrder.getStationId(), wkOrder.getId(), loginUserId);
} catch (Exception e) {
log.warn("璁㈠崟 {} 寮�濮嬭嚜鍔ㄥ嚭搴�", syncOrder.getOrderNo());
}
@@ -613,29 +609,31 @@
}
@Async
- public void asyncOutboundExecutionWcs(List<OutStockToTaskParams> param, Long orderId, Long loginUserId) {
+ public void asyncOutboundExecutionWcs(String stationId ,Long orderId, Long loginUserId) {
try {
-// int i = 0;
-// List<OutStockToTaskParams> tasks = new ArrayList<>();
-// while (true) {
-// tasks = new ArrayList<>();
-// i++;
-// if (i > 5) return;
-// Thread.sleep(3000);
-// for (OutStockToTaskParams taskParam : new OutStockToTaskParams[param.size()]) {
-// if (StringUtils.isNotBlank(taskParam.getLocCode())) {
-// tasks.add(taskParam);
-// }
-// }
-// break;
-// }
- if (param.isEmpty()){
+
+ OrderOutTaskParam orderOutTaskParam = new OrderOutTaskParam();
+ orderOutTaskParam.setOrderId(orderId);
+ orderOutTaskParam.setWaveId(16L);
+ List<OrderOutItemDto> orderOutTaskItemAuto = outStockService.getOrderOutTaskItemAuto(orderOutTaskParam);
+
+ List<OutStockToTaskParams> tasks = new ArrayList<>();
+ for (OrderOutItemDto orderOutItemDto : orderOutTaskItemAuto){
+ OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderOutItemDto);
+ outStockToTaskParams.setId(orderOutItemDto.getLocItem().getId());
+// outStockToTaskParams.setOutQty(locItemServiceOne.getAnfme());
+ outStockToTaskParams.setLocCode(orderOutItemDto.getLocItem().getLocCode());
+ outStockToTaskParams.setBarcode(orderOutItemDto.getLocItem().getBarcode());
+ outStockToTaskParams.setSiteNo(stationId);
+ tasks.add(outStockToTaskParams);
+ }
+ if (tasks.isEmpty()){
log.warn("璁㈠崟ID {} 娌℃湁鎵惧埌鍙嚭搴撴槑缁嗭紝璺宠繃鑷姩鍑哄簱", orderId);
return;
}
- outStockService.genOutStockTask(param, loginUserId, orderId);
+ outStockService.genOutStockTask(tasks, loginUserId, orderId);
- log.info("璁㈠崟ID {} 鑷姩鍑哄簱锛屽叡澶勭悊 {} 涓槑缁�", orderId, param.size());
+ log.info("璁㈠崟ID {} 鑷姩鍑哄簱锛屽叡澶勭悊 {} 涓槑缁�", orderId, tasks.size());
} catch (Exception e) {
log.error("璁㈠崟ID {} 鑷姩鍑哄簱: {}", orderId, e.getMessage(), e);
}
--
Gitblit v1.9.1