From aa95589f3b49e10a72b2200a865c46b8077a4204 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 11:16:32 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5123cc4..692f5fa 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -47,6 +47,13 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/locMerge/out/start/sxk")
+ @ManagerAuth(memo = "骞舵澘鍑哄簱")
+ public R locMergeOutStartSxk(@RequestBody StockOutParam param) {
+ workService.locMergeOutSxk(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/available/put/site")
@ManagerAuth()
public R availablePutSite(){
@@ -78,8 +85,6 @@
}
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());
@@ -169,13 +174,19 @@
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
public R availableEmptyTakeSite(){
+ List<Map<String, Object>> result = new ArrayList<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
wrapper.eq("type_no",110);
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+// RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
List<StaDesc> staDescs = staDescService.selectList(wrapper);
- List<Integer> collect = staDescs.stream().map(StaDesc::getStnNo).distinct().collect(Collectors.toList());
- return R.ok().add(collect);
+ for (StaDesc staDesc : staDescs) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", staDesc.getStnNo());
+ map.put("desc","["+ Utils.getStaName(staDesc.getStnNo())+"]");
+ result.add(map);
+ }
+ return R.ok().add(result);
// return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@@ -217,6 +228,13 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/locCheck/out/start/sxk")
+ @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+ public R locCheckOutStartsxk(@RequestBody StockOutParam param) {
+ workService.locCheckOutsxk(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/loc/move/start")
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
--
Gitblit v1.9.1