From 780a1afb3bc6ff428b46373d40ad55e4090c8584 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 05 十一月 2024 10:41:06 +0800
Subject: [PATCH] 出库根据不同上级角色，显示不同库信息的出库站点
---
src/main/java/com/zy/asrs/controller/WorkController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index cd2a71f..bcff12f 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -58,14 +58,28 @@
@ManagerAuth()
public R availableTakeSite(){
List<Map<String, Object>> result = new ArrayList<>();
- List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+ RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+ wrapper.eq("type_no",101);
+ List<StaDesc> staDescs = staDescService.selectList(wrapper);
+ List<Integer> outSite = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
+// List<Integer> outSite = basDevpService.getAvailableOutSite(101);
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
result.add(map);
}
- List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+
+ EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+ RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper2);
+ wrapper2.eq("type_no",103);
+ List<StaDesc> staDescs2 = staDescService.selectList(wrapper2);
+ List<Integer> pickOutSite = staDescs2.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
+
+// List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
--
Gitblit v1.9.1