From 296092f6666919867ac630efd986a60642e3d71e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 14 二月 2025 13:52:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index a8121cb..361f7e6 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -285,7 +285,7 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", combParam.getBarcode())
.eq("io_type", 104)
- .eq("wrk_sts", 14));
+ .in("wrk_sts", 14,105));
if (Cools.isEmpty(wrkMast)) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
@@ -295,6 +295,28 @@
}
+ }
+
+ @RequestMapping("/pingKu/Shelves/auth")
+ @ManagerAuth(memo = "骞冲簱涓婃灦")
+ public R pingKuShelves(@RequestBody CombParam combParam){
+ if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuShelves(combParam, getUserId());
+
+ return R.ok();
+ }
+
+ @RequestMapping("/pingKu/unShelves/auth")
+ @ManagerAuth(memo = "骞冲簱涓嬫灦")
+ public R pingKuUnShelves(@RequestBody CombParam combParam){
+ if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuUnShelves(combParam, getUserId());
+
+ return R.ok();
}
@RequestMapping("/pack/get/auth")
@@ -544,6 +566,13 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @RequestMapping("/pda/adjust/auth")
+ @ManagerAuth(memo = "pda鐩樼偣")
+ public R pdaAdjust(@RequestBody pdaAdjustParam param){
+ mobileService.pdaAdjust(param,getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -554,6 +583,14 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ @GetMapping("/checkOut/submit/auth")
+ @ManagerAuth(memo = "鐩樼偣涓婁紶")
+ public R CheckOutUploadERP(@RequestParam String orderId){
+ mobileService.inventoryUpload(orderId);
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
+
@RequestMapping("/ddd/ddd")
@ManagerAuth()
public R ddd() {
--
Gitblit v1.9.1