From dce5ad72afba339f4094ef89bfa924eba6772834 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期四, 20 十一月 2025 21:38:09 +0800
Subject: [PATCH] 入庫功能優化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 623a6ac..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,8 @@
                     /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
                     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>()
@@ -616,12 +616,16 @@
                     //妫�鏌ュ崟鎹槸鍚﹀畬鎴�
                     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);

--
Gitblit v1.9.1