From 010dc23827d3b1020356b6741ec47f7ce81497ab Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 05 七月 2024 13:05:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs
---
src/main/java/com/zy/asrs/controller/WorkController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 09acbae..c5218ff 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -70,6 +70,12 @@
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
+ @RequestMapping("/available/take/merge/site")
+ @ManagerAuth()
+ public R availableTakeMergeSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(104));
+ }
+
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
public R availableEmptyTakeSite(){
@@ -109,6 +115,13 @@
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
+ @RequestMapping("/locMerge/out/start")
+ @ManagerAuth(memo = "骞舵澘鍑哄簱")
+ public R locMergeOutStart(@RequestBody StockOutParam param) {
+ workService.locMergeOut(param, getUserId());
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@RequestMapping("/loc/move/start")
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
@@ -116,17 +129,21 @@
workService.locMove(sourceLocNo, targetLocNo, getUserId());
return R.ok("绉诲簱鍚姩鎴愬姛");
}
+
@RequestMapping("/locCombOutStartCheckSite/site")
@ManagerAuth(memo = "骞舵澘鍑哄簱绔欑偣鏌ヨ")
public R locCombOutStartCheckSite(){
+
return R.ok().add(basDevpService.getAvailableOutSite(104));
}
+
@RequestMapping("/locComb/out/start")
@ManagerAuth(memo = "骞舵澘鍑哄簱")
public R locCombOutStart(@RequestBody ReplenishmentParam param) {
workService.locCombOut(param,getUserId());
return R.ok("琛ユ枡鍑哄簱鍚姩鎴愬姛");
}
+
@RequestMapping("/locDdetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
--
Gitblit v1.9.1