From ecf0bb23387e5d33d5c802fa21bb9f84089d3567 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期三, 19 十一月 2025 18:41:26 +0800
Subject: [PATCH] 齣庫功能優化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

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 eba84ff..36f6740 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
@@ -683,9 +683,9 @@
         if (Objects.isNull(loc)) {
             throw new CoolException("搴撳瓨涓嶅瓨鍦紒锛�");
         }
-//        if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
-//            throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
-//        }
+        if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+            throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
+        }
 
         loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type)
                 .setBarcode(task.getBarcode())
@@ -788,7 +788,6 @@
             } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
                 List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, Arrays.asList(ids)));
                 if (!taskItems.isEmpty()) {
-
                     taskItems.forEach(taskItem -> {
                         if (!checkOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                                 .eq(WkOrderItem::getId, taskItem.getOrderItemId())
@@ -1035,10 +1034,10 @@
                 }
             });
         });
-        List<Long> matnrIds = taskItems.stream().map(TaskItem::getMatnrId).collect(Collectors.toList());
+        List<String> matnrIds = taskItems.stream().map(TaskItem::getFieldsIndex).collect(Collectors.toList());
         //鍒犻櫎涓庝换鍔℃槑缁嗛噸澶嶇殑搴撳瓨淇℃伅锛屼互浠诲姟鏄庣粏涓哄噯
         List<LocItemWorking> itemWorkings = tempLocs.stream()
-                .filter(working -> !matnrIds.contains(working.getMatnrId()))
+                .filter(working -> !matnrIds.contains(working.getFieldsIndex()))
                 .collect(Collectors.toList());
         itemWorkings.forEach(working -> {
             TaskItem taskItem = taskItems.stream().findFirst().get();

--
Gitblit v1.9.1