From 111bb26289ea4d8b855b288cbca4793e3722c2bf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 19:51:55 +0800
Subject: [PATCH] # 手动调拨
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index de60dca..4d3394b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -368,15 +368,18 @@
short floor =(short)Integer.parseInt(fl.substring(0, 1));
List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
params.get("dbList");
- Object moveType = params.get("moveType");
- if (moveType == "unAuto") {
- return R.error("鎵嬪姩鍔熻兘鏆傛椂鏃犳硶浣跨敤");
+ Object mT = params.get("moveType");
+ String moveType = "";
+ if (mT.equals("unAuto")) {
+ moveType = "2";
+ } else {
+ moveType = "1";
}
for (HashMap<String, String> map : dbList) {
String locNo = map.get("locNo");
Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq("loc_no", locNo);
AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
- agvLocMast.setLocType("1");
+ agvLocMast.setLocType(moveType);
agvLocMast.setLocType3(floor);
agvLocMastService.update(agvLocMast,wrapper);
// 鍚屾璋冩嫧鍗�
@@ -401,6 +404,22 @@
return R.ok();
}
+ @PostMapping("/hand/control/allocationOut")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧绂诲満")
+ public R allocationOut(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/allocationIn")
+ @Transactional
+ @ManagerAuth(memo = "璋冩嫧杩涘満")
+ public R allocationIn(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.allocationIn(param, getUserId());
+ return R.ok();
+ }
+
public static void main(String[] args) {
List<AgvLocDetl> agvLocDetls1 = new ArrayList<>();
List<AgvLocDetl> agvLocDetls2 = new ArrayList<>();
--
Gitblit v1.9.1