From e61f054bf5bf18c8a0095b0ee4b5ff0ea0f0d2f1 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 20 三月 2025 14:42:30 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AgvIoWorkController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
index e7f1044..925a0c7 100644
--- a/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvIoWorkController.java
@@ -9,7 +9,6 @@
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.AgvLocMast;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.AgvBasDevpService;
import com.zy.asrs.service.AgvLocDetlService;
@@ -66,6 +65,10 @@
param.remove("row");
}
}
+ if(!Cools.isEmpty(param.get("floor"))){
+ wrapper.like("loc_no","@"+param.get("floor"));
+ param.remove("floor");
+ }
excludeTrash(param);
convert(param, wrapper);
allLike(AgvLocDetl.class, param.keySet(), wrapper, condition);
@@ -118,7 +121,7 @@
return null;
}
- int floor = Integer.parseInt(sourceLocNo.split("@")[1]);
+ int floor = Integer.parseInt(sourceLocNo.split("F")[1]);
List<String> locNoList = agvLocMastService.queryGroupEmptyStock(floor);
@@ -140,18 +143,18 @@
return R.ok().add(agvBasDevpService.getAvailableEmptyInSite());
}
- @RequestMapping("/empty/plate/in/start")
- @ManagerAuth(memo = "绌烘澘鍏ュ簱")
- public R emptyPlateInStart(@RequestParam String sourceStaNo) {
- return R.ok("鍏ュ簱鍚姩鎴愬姛").add(agvWorkService.emptyPlateIn(sourceStaNo, getUserId()));
- }
+// @RequestMapping("/empty/plate/in/start")
+// @ManagerAuth(memo = "绌烘澘鍏ュ簱")
+// public R emptyPlateInStart(@RequestParam String sourceStaNo, String containerCode) {
+// return R.ok("鍏ュ簱鍚姩鎴愬姛").add(agvWorkService.emptyPlateIn(sourceStaNo,containerCode,getUserId()));
+// }
- @RequestMapping("/empty/plate/out/start")
- @ManagerAuth(memo = "绌烘澘鍑哄簱")
- public R emptyPlateOutStart(EmptyPlateOutParam param) {
- agvWorkService.emptyPlateOut(param, getUserId());
- return R.ok("鍑哄簱鍚姩鎴愬姛");
- }
+// @RequestMapping("/empty/plate/out/start")
+// @ManagerAuth(memo = "绌烘澘鍑哄簱")
+// public R emptyPlateOutStart(EmptyPlateOutParam param) {
+// agvWorkService.emptyPlateOut(param, getUserId());
+// return R.ok("鍑哄簱鍚姩鎴愬姛");
+// }
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
--
Gitblit v1.9.1