From 3a129dc7cbc261d6d73521875f94ff75ba88aa84 Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期二, 11 二月 2025 13:05:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 61aea20..361f7e6 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -62,6 +62,16 @@
@Autowired
private CommonService commonService;
+
+// @PostMapping("/agv/start")
+// @ManagerAuth
+// public R pdaStockCheck(@RequestBody StockCheckParam param){
+//
+//
+//
+// }
+
+
@PostMapping("/agv/start")
@ManagerAuth
public R pdaAgvStart(@RequestBody Map<String,Object> map){
@@ -275,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("缁勬墭鎴愬姛");
@@ -285,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")
@@ -534,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) {
@@ -544,25 +583,33 @@
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() {
int w = 64;
for (int i = 17; i <= 37; i++) {
for (int j = 1;j<=3;j++){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 7).eq("lev1", j));
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 7).eq("lev1", j));
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", j));
LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", j));
// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
- if (locMast.getGro1() == 999){
- continue;
- }
+// if (locMast.getGro1() == 999){
+// continue;
+// }
// locMast.setGro1(w);
- locMast.setGro1(locMast.getGro1()+1000);
- locMast2.setGro1(locMast.getGro1()+1000);
- locMast3.setGro1(locMast.getGro1()+1000);
+// locMast.setGro1(locMast.getGro1()+1000);
+ locMast2.setGro1(locMast2.getGro1()+10000);
+ locMast3.setGro1(locMast3.getGro1()+2000);
// locMast4.setGro1(w);
- locMastService.updateById(locMast);
+// locMastService.updateById(locMast);
locMastService.updateById(locMast2);
locMastService.updateById(locMast3);
// locMastService.updateById(locMast4);
--
Gitblit v1.9.1