From 5acd4f1256256e6bd16b41bb2e435d3063ab0f4a Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 10 三月 2026 10:59:27 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 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 af614d7..52fb504 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
@@ -19,10 +19,7 @@
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;
+import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
@@ -615,32 +612,38 @@
public void asyncOutboundExecutionWcs(String stationId ,Long orderId, Long loginUserId) {
try {
- OrderOutTaskParam orderOutTaskParam = new OrderOutTaskParam();
- orderOutTaskParam.setOrderId(orderId);
- orderOutTaskParam.setWaveId(16L);
- List<OrderOutItemDto> orderOutTaskItemAuto = outStockService.getOrderOutTaskItemAuto(orderOutTaskParam);
+ GenWaveParams genWaveParams = new GenWaveParams();
+ List<Long> ids = new ArrayList<>();
+ ids.add(orderId);
+ genWaveParams.setIds(ids);
+ genWaveParams.setWaveRuleId(16L);
+// 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){
+// for (LocItem locItem : orderOutItemDto.getLocItemList()) {
+// OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderOutItemDto,locItem);
+// outStockToTaskParams.setId(locItem.getId());
+// outStockToTaskParams.setOutQty(locItem.getOutQty());
+// outStockToTaskParams.setLocCode(locItem.getLocCode());
+// outStockToTaskParams.setBarcode(locItem.getBarcode());
+// outStockToTaskParams.setSiteNo(stationId);
+// tasks.add(outStockToTaskParams);
+// }
+// }
+// if (tasks.isEmpty()){
+// log.warn("璁㈠崟ID {} 娌℃湁鎵惧埌鍙嚭搴撴槑缁嗭紝璺宠繃鑷姩鍑哄簱", orderId);
+// return;
+// }
+// outStockService.genOutStockTask(tasks, loginUserId, orderId);
+ R r = outStockService.generateWavesOrderAuto(genWaveParams, stationId);
- List<OutStockToTaskParams> tasks = new ArrayList<>();
- for (OrderOutItemDto orderOutItemDto : orderOutTaskItemAuto){
- for (LocItem locItem : orderOutItemDto.getLocItemList()) {
- OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderOutItemDto,locItem);
- outStockToTaskParams.setId(locItem.getId());
- outStockToTaskParams.setOutQty(locItem.getOutQty());
- outStockToTaskParams.setLocCode(locItem.getLocCode());
- outStockToTaskParams.setBarcode(locItem.getBarcode());
- outStockToTaskParams.setSiteNo(stationId);
- tasks.add(outStockToTaskParams);
- }
- }
- if (tasks.isEmpty()){
- log.warn("璁㈠崟ID {} 娌℃湁鎵惧埌鍙嚭搴撴槑缁嗭紝璺宠繃鑷姩鍑哄簱", orderId);
- return;
- }
- outStockService.genOutStockTask(tasks, loginUserId, orderId);
-
- log.info("璁㈠崟ID {} 鑷姩鍑哄簱锛屽叡澶勭悊 {} 涓槑缁�", orderId, tasks.size());
+ log.info("璁㈠崟ID {} 鑷姩杞尝娆�", orderId);
} catch (Exception e) {
- log.error("璁㈠崟ID {} 鑷姩鍑哄簱: {}", orderId, e.getMessage(), e);
+ log.error("璁㈠崟ID {} 鑷姩杞尝娆�: {}", orderId, e.getMessage(), e);
}
}
--
Gitblit v1.9.1