From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:44:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 86 ++++++++++++++++++++++++++----------------
1 files changed, 53 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6a9a1e9..42d7241 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -38,10 +38,6 @@
@Autowired
private LocDetlService locDetlService;
@Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
private DocTypeService docTypeService;
@Autowired
private WrkMastService wrkMastService;
@@ -137,34 +133,6 @@
return R.ok("涓嬫灦鎴愬姛");
}
-
-
- // 缁勬墭 ----------------------------------------------------------------------------------------------------
-
- /**
- * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
- * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
- */
-// @RequestMapping("/order/search/orderNo/auth")
-// @ManagerAuth
-// public R orderSearchByBarcode(@RequestParam String orderNo){
-// Order order = orderService.selectByNo(orderNo);
-// if (order == null) {
-// return R.ok();
-// }
-// DocType docType = docTypeService.selectById(order.getDocType());
-// if (docType.getPakin() == null || docType.getPakin() != 1) {
-// return R.ok();
-// }
-// if (order.getSettle() > 2) {
-// return R.ok();
-// }
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
-// if (Cools.isEmpty(orderDetls)) {
-// return R.ok();
-// }
-// return R.ok().add(orderDetls);
-// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
public R orderSearchByBarcode(@RequestParam String orderNo){
@@ -201,12 +169,23 @@
combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setBrand(orderDetl.getBrand());
+ combMat.setSku(orderDetl.getSku());
+ combMat.setMemo(orderDetl.getMemo());
+ combMat.setBoxType1(orderDetl.getBoxType1());
+ combMat.setBoxType2(orderDetl.getBoxType2());
+ combMat.setBoxType3(orderDetl.getBoxType3());
+ combMat.setStandby1(orderDetl.getStandby1());
+ combMat.setStandby2(orderDetl.getStandby2());
+ combMat.setStandby3(orderDetl.getStandby3());
combMats.add(combMat);
}
combParam.setCombMats(combMats);
}
combParam.setOrderNo(order.getOrderNo());
- combParams.add(combParam);
+ return R.ok().add(combParam);
+
+// combParams.add(combParam);
}
}
return R.ok().add(combParams);
@@ -215,10 +194,51 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
+// mobileService.comb(combParam, getUserId());
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("/loc/origin/query/auth")
+ @ManagerAuth(memo = "搴撳瓨鏌ヨ")
+ public R locOriginQuery(@RequestParam("barcode") String barcode){
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
+ return R.ok("鍦ㄥ簱鏍囪淇敼鎴愬姛").add(locDetlList);
+ }
+ @RequestMapping("/loc/origin/in/out/auth")
+ @ManagerAuth(memo = "鍦ㄥ簱鏍囪淇敼")
+ public R locOriginInOut(@RequestBody LocDetl locDetl){
+ return mobileService.locOriginInOut(locDetl, getUserId());
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
public R packGet(@RequestParam String barcode){
--
Gitblit v1.9.1