From 3729897e1b92b28a4f6d0ee612cf3bb9465c807d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 14 四月 2025 15:29:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 +++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 33 +++++++++++++++++++++++++++++++--
src/main/java/com/zy/asrs/service/MobileService.java | 10 ++++++++++
3 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 81c633e..ed791d8 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -272,13 +272,42 @@
}
@RequestMapping("/comb/auth")
-// @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
// mobileService.comb(combParam, getUserId());
- mobileService.comb(combParam, 9999L);
+ mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/kitting/query/auth")
+ @ManagerAuth(memo = "榻愬鍏ュ簱鏌ヨ")
+ public R kittingQuery(@RequestBody CombParam combParam){
+ try {
+ return mobileService.kittingQuery(combParam, getUserId());
+ } catch (Exception e){
+
+ }
+// return R.ok("榻愬鍏ュ簱鏌ヨ鎴愬姛");
+ return R.error("榻愬鍏ュ簱鏌ヨ澶辫触");
+ }
+
+ @RequestMapping("/kitting/call/auth")
+ @ManagerAuth(memo = "榻愬鍏ュ簱鍛煎彨")
+ public R kittingCall(@RequestParam("locNo") String locNo){
+ mobileService.kittingCall(locNo, getUserId());
+ return R.ok("榻愬鍏ュ簱鍛煎彨鎴愬姛");
+ }
+
+ @RequestMapping("/kitting/call/all/auth")
+ @ManagerAuth(memo = "榻愬鍏ュ簱鍛煎彨")
+ public R kittingCall(@RequestBody CombParam combParam){
+ List<CombParam.CombMat> combMats = combParam.getCombMats();
+ for (CombParam.CombMat locDetl : combMats) {
+ mobileService.kittingCall(locDetl.getMemo(), getUserId());
+ }
+ return R.ok("榻愬鍏ュ簱鍛煎彨鎴愬姛");
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
public R packGet(@RequestParam String barcode){
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index c1d97d0..4db6f05 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -47,6 +47,16 @@
void comb(CombParam param, Long userId);
/**
+ * 榻愬鍏ュ簱鏌ヨ
+ */
+ R kittingQuery(CombParam combParam, Long userId);
+
+ /**
+ * 榻愬鍏ュ簱鍛煎彨
+ */
+ void kittingCall(String locNo, Long userId);
+
+ /**
* 涓婃灦
*/
void onSale(CombParam param);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 65696a8..c2f81eb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -668,6 +668,19 @@
}
+ @Override
+ @Transactional
+ public R kittingQuery(CombParam combParam, Long userId) {
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
+ return R.ok().add(locDetlList);
+ }
+
+ @Override
+ @Transactional
+ public void kittingCall(String locNo, Long userId) {
+
+ }
+
// 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
--
Gitblit v1.9.1