From 7b13ed71201b92038caf4905ee0d6489a6025713 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 08:25:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index f507486..f61ca98 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.AgvBasDevp;
@@ -14,6 +15,7 @@
import com.zy.asrs.entity.param.PickParam;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
+import io.swagger.models.auth.In;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -62,10 +64,10 @@
// 鍐嶆鎷ｆ枡
@RequestMapping("/pick/again/auth")
-// @ManagerAuth(memo = "缁勬墭")
+ @ManagerAuth(memo = "鍐嶆鎷ｆ枡")
public R pickAgain(@RequestBody PickParam pickParams){
agvMobileService.pickAgain(pickParams, 1l);
- return R.ok("缁勬墭鎴愬姛");
+ return R.ok("鎷ｆ枡鎴愬姛");
}
/*
@@ -185,6 +187,7 @@
String orderNo = params.get("orderNo");
String threeCode = params.get("threeCode");
String matnr = params.get("matnr");
+ String floor = params.get("floor");
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
@@ -193,17 +196,26 @@
wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
if (threeCode.substring(0,2).equals(30)) {
- wrapper.isNull("specs").or().eq("specs","");
+ wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
}
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
-
+ List<AgvLocDetl> locDetls = new ArrayList<>();
for (AgvLocDetl agvLocDetl : agvLocDetls) {
- AgvLocMast locNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()));
- agvLocDetl.setLocSts(locNo.getLocSts());
- agvLocDetl.setLocSts$(locNo.getLocSts$());
+ AgvLocMast agvLocMast = new AgvLocMast();
+ if (Cools.isEmpty(floor)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ }
+
+ if (Cools.isEmpty(agvLocMast)) continue;
+ agvLocDetl.setLocSts(agvLocMast.getLocSts());
+ agvLocDetl.setLocSts$(agvLocMast.getLocSts$());
+ locDetls.add(agvLocDetl);
}
- return R.ok(agvLocDetls);
+
+ return R.ok(locDetls);
}
/*
--
Gitblit v1.9.1