From 56de968727bd6e871c6823dce837f8d42f30e6f8 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 10 六月 2025 09:28:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 3d98e4c..ded73a3 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -69,13 +69,8 @@
public R availableTakeSite() {
Set<Map<String, Object>> result = new HashSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
- // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- //RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
- wrapper.eq("type_no", 101);
- wrapper.orderBy("stn_no", true);
+ wrapper.eq("type_no", 101).eq("crn_no", 1).orderBy("stn_no", true);
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 (StaDesc site : staDescs) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", site.getStnNo());
@@ -84,12 +79,8 @@
}
EntityWrapper<StaDesc> wrapper2 = new EntityWrapper<>();
- wrapper2.eq("type_no", 103);
- wrapper.orderBy("stn_no", true);
+ wrapper2.eq("type_no", 103).eq("crn_no", 1).orderBy("stn_no", true);
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 (StaDesc site : staDescs2) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", site.getStnNo());
@@ -105,6 +96,9 @@
List<Map<String, Object>> result = new ArrayList<>();
List<Integer> outSite = basDevpService.getCrnAvailableOutSite(101);
for (Integer siteId : outSite) {
+ if (siteId < 1100) {
+ continue;
+ }
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
@@ -112,6 +106,9 @@
}
List<Integer> pickOutSite = basDevpService.getCrnAvailableOutSite(103);
for (Integer siteId : pickOutSite) {
+ if (siteId < 1100) {
+ continue;
+ }
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
@@ -123,7 +120,14 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth()
public R availableTakeCheckSite() {
- return R.ok().add(basDevpService.getAvailableOutSite(107));
+ List<Integer> availableOutSite = basDevpService.getAvailableOutSite(107);
+ List<Integer> data = new ArrayList<>();
+ for (Integer x : availableOutSite) {
+ if (x < 1100) {
+ data.add(x);
+ }
+ }
+ return R.ok().add(data);
}
@RequestMapping("/available/take/merge/site")
@@ -138,7 +142,7 @@
EntityWrapper<StaDesc> staDescEntityWrapper = new EntityWrapper<>();
staDescEntityWrapper.eq("type_no", 107);
staDescEntityWrapper.setSqlSelect("DISTINCT stn_no as stnNo");
- staDescEntityWrapper.in("crn_no", 1, 2, 3, 4, 5, 6, 7);
+ staDescEntityWrapper.in("crn_no", 1);
return R.ok().add(staDescService.selectList(staDescEntityWrapper));
}
@@ -182,6 +186,9 @@
// RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
List<StaDesc> staDescs = staDescService.selectList(wrapper);
for (StaDesc staDesc : staDescs) {
+ if (staDesc.getCrnNo() == 7) {
+ continue;
+ }
Map<String, Object> map = new HashMap<>();
map.put("siteId", staDesc.getStnNo());
map.put("desc", "[" + Utils.getStaName(staDesc.getStnNo()) + "]");
--
Gitblit v1.9.1