From 40254eb1fc7ad9bef6e820c0ffc0cc5a63e9e53e Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 21 十月 2025 09:53:54 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/MobileController.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8986c3f..b560a5e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -279,13 +279,14 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
+ log.info("缁勬墭锛�"+JSONObject.toJSONString(combParam));
if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
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("缁勬墭鎴愬姛");
@@ -304,6 +305,17 @@
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();
}
@@ -583,20 +595,20 @@
@RequestMapping("/ddd/ddd")
@ManagerAuth()
public R ddd() {
- int w = 64;
+ int w = 99999;
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 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));
+ for (int j = 8;j<=14;j++){
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
+ LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
// 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(locMast2.getGro1()+10000);
- locMast3.setGro1(locMast3.getGro1()+2000);
+ locMast2.setGro1(locMast.getGro1()+1000);
+ locMast3.setGro1(locMast.getGro1()+2000);
// locMast4.setGro1(w);
// locMastService.updateById(locMast);
locMastService.updateById(locMast2);
@@ -606,19 +618,23 @@
}
}
// for (int i = 17; i <=37; i++) {
-// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
-//// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
-//// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 3).eq("lev1", 1));
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 8).eq("lev1", 1));
+// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 13).eq("lev1", 1));
//// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
-// locMast.setGro1(w);
-//// locMast2.setGro1(w);
-//// locMast3.setGro1(w);
+// if (!Cools.isEmpty(locMast)) {
+// locMast.setGro1(w);
+// locMastService.updateById(locMast);
+// }
+//
+// locMast2.setGro1(w);
+// locMast3.setGro1(w);
//// locMast4.setGro1(w);
-// locMastService.updateById(locMast);
-//// locMastService.updateById(locMast2);
-//// locMastService.updateById(locMast3);
+//
+// locMastService.updateById(locMast2);
+// locMastService.updateById(locMast3);
//// locMastService.updateById(locMast4);
-// w++;
+//// w++;
// }
return R.ok();
--
Gitblit v1.9.1