From 175cd5761970d1fd06b500c2fa0d5528c3571fb6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 26 一月 2026 11:08:38 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java | 1 +
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 11 +++++++++++
3 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index 021ef4a..9607752 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -158,6 +158,17 @@
}
}
+ @ApiOperation("鑾峰彇鎷栫洏鍙敤搴撳尯")
+ @PostMapping("/asnOrderItem/container/area")
+ public R getItemByContainerArea(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return mobileService.getItemByContainerArea(params, getLoginUser());
+
+ }
+
@ApiOperation("缁勬墭")
@PostMapping("/waitPakin/merge")
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
index 935e9d7..76cf52c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/MobileService.java
@@ -68,6 +68,7 @@
R completeOrder(Long id, Long loginUserId);
R getItemByContainer(Map<String, Object> params,User user);
+ R getItemByContainerArea(Map<String, Object> params,User user);
R getUnItemByContainer(Map<String, Object> params);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index bdaf340..99f0a4d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -1045,6 +1045,46 @@
/**
* @param
+ * @param user
+ * @return
+ * @author Ryan
+ * @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
+ * @time 2025/4/9 16:57
+ */
+ @Override
+ public R getItemByContainerArea(Map<String, Object> params, User user) {
+ List<BasContainer> containers = basContainerService.list();
+ for (BasContainer container : containers) {
+ String codeType = container.getCodeType(); // 鑾峰彇姝ｅ垯琛ㄨ揪寮�
+ if (params.get("barcode").toString().matches(codeType)) { // 鍒ゆ柇鏉＄爜鏄惁绗﹀悎杩欎釜姝ｅ垯
+ List<WarehouseRoleMenu> warehouseRoleMenus = warehouseRoleMenuService
+ .list(new LambdaQueryWrapper<WarehouseRoleMenu>()
+ .in(WarehouseRoleMenu::getRoleId, Arrays.asList(user.getUserRoleIds())));
+ Set<WarehouseRoleMenu> warehouseRoleMenusSet = new HashSet<>(warehouseRoleMenus);
+ // 鑾峰彇 menuId 闆嗗悎
+ Set<Long> menuIdSet = warehouseRoleMenusSet.stream()
+ .map(WarehouseRoleMenu::getMenuId)
+ .collect(Collectors.toSet());
+ // 鑾峰彇 areaList 骞惰浆鎹负 Long 绫诲瀷鐨� Set
+ List<Integer> areaList = container.getAreas();
+ Set<Long> areaSet = new HashSet<>();
+ if (areaList != null) {
+ areaList.forEach(area -> areaSet.add(area.longValue()));
+ }
+ // 姹備袱涓泦鍚堢殑浜ら泦
+ menuIdSet.retainAll(areaSet);
+
+ List<WarehouseAreas> areas = warehouseAreasService.list(new LambdaQueryWrapper<WarehouseAreas>()
+ .in(WarehouseAreas::getId, menuIdSet));
+ return R.ok(areas);
+
+ }
+ }
+ return R.ok(new ArrayList<>());
+ }
+
+ /**
+ * @param
* @return
* @author Ryan
* @description 閫氳繃瀹瑰櫒鑾峰彇缁勬嫋鐗╂枡
--
Gitblit v1.9.1