From 561728125973f6ea4f022fbfae3b747f7650a704 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 20 十一月 2025 21:47:54 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 73e1bcc..a68b334 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -598,8 +598,34 @@
/**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
reportMsgService.reportOrderItem(wkOrderItem);
}
- } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
-
+ } else if ((task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type)
+ || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
+ /**鍒ゆ柇鍗曟嵁鏄惁瀹屾垚**/
+ Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
+ List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
+ .in(WaveOrderRela::getWaveId, longSet));
+ if (Cools.isEmpty(waveOrderRelas)) {
+ throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
+ }
+ Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
+ List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds);
+ if (wkOrders.isEmpty()) {
+ throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ }
+ wkOrders.forEach(order -> {
+ //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
+ if (order.getAnfme().compareTo(order.getQty()) == 0) {
+ order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+// if (order.getType().equals(OrderType.ORDER_IN)) {
+// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
+// } else {
+// order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
+// }
+ if (!asnOrderService.updateById(order)) {
+ throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
+ }
+ }
+ });
//鍑哄簱鍗曚笂鎶CS淇敼搴撲綅鐘舵��
try {
reportStationStatus(task);
@@ -607,32 +633,6 @@
throw new CoolException(e.getMessage());
}
}
-
- /**鍒ゆ柇鍗曟嵁鏄惁瀹屾垚**/
- Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
- List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
- .in(WaveOrderRela::getWaveId, longSet));
- if (Cools.isEmpty(waveOrderRelas)) {
- throw new CoolException("娉㈡瀵瑰簲鍏宠仈鍗曟湭鎵惧埌");
- }
- Set<Long> orderIds = waveOrderRelas.stream().map(WaveOrderRela::getOrderId).collect(Collectors.toSet());
- List<WkOrder> wkOrders = asnOrderService.listByIds(orderIds);
- if (wkOrders.isEmpty()) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- wkOrders.forEach(order -> {
- //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
- if (order.getAnfme().compareTo(order.getQty()) == 0) {
- if (order.getType().equals(OrderType.ORDER_IN)) {
- order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- } else {
- order.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val);
- }
- if (!asnOrderService.updateById(order)) {
- throw new CoolException("鍑哄簱鍗曟洿鏂扮姸鎬佸け璐�");
- }
- }
- });
List<TaskItemLog> itemLogs = new ArrayList<>();
for (TaskItem item : taskItems) {
--
Gitblit v1.9.1