From 27c184d7af2775a4d647348ee508f4de335df8fb Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 11 三月 2026 15:28:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 8b6a223..1fc5c4d 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +48,14 @@
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
+ @RequestMapping("/test/station/storage/crn/list")
+ @ManagerAuth(memo = "娴嬭瘯绔欑偣搴撳尯鍫嗗灈鏈洪『搴�")
+ public R testStationStorageCrnList(@RequestParam Integer stationId,
+ @RequestParam(required = false) Integer locType1,
+ @RequestParam(required = false) String matnr) {
+ List<Map<String, Integer>> stationStorageAreaName = Utils.getStationStorageAreaName(stationId, locType1, matnr);
+ return R.ok().add(stationStorageAreaName);
+ }
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
@@ -68,6 +77,13 @@
return R.ok().add(result);
}
+ @RequestMapping("/turn/over/out/start")
+ @ManagerAuth(memo = "瀹㈡埛杞崲")
+ public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
+ workService.turnOverOut(param, getUserId());
+ return R.ok("瀹㈡埛杞崲鎴愬姛");
+ }
+
@RequestMapping("/available/take/check/site")
@ManagerAuth()
public R availableTakeCheckSite(){
@@ -83,7 +99,12 @@
@RequestMapping("/full/store/put/start")
@ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+ try {
+ String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
+ return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
+ } catch (Exception e){
+ return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage());
+ }
}
@RequestMapping("/plate/out/start")
@@ -173,3 +194,4 @@
}
}
+
--
Gitblit v1.9.1