From e4fd378a3a3710a81d40adf85137268c97b17950 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 14 六月 2024 08:19:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 145 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 137 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 c8e678a..6f5929e 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -12,6 +12,8 @@
import com.zy.common.web.BaseController;
import io.swagger.models.auth.In;
import lombok.Synchronized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,8 @@
@RequestMapping("agvMobile")
public class AgvMobileController extends BaseController {
+
+ private static final Logger log = LoggerFactory.getLogger(AgvMobileController.class);
@Autowired
private AgvMobileService agvMobileService;
@Autowired
@@ -64,7 +68,7 @@
}
/*
- 缁戝畾鎵樼洏鏉＄爜涓庢殏瀛樹綅
+ 缁戝畾璐ф灦鏉＄爜涓庢殏瀛樹綅
*/
@PostMapping("/combBinging/auth")
public R combBinding(@RequestBody Map<String,Object> map){
@@ -72,7 +76,7 @@
String stationCode = map.get("stationCode").toString();
Short containerType = Short.valueOf(barcode.substring(0,2));
agvMobileService.combBinding(barcode,stationCode,containerType);
- return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
+ return R.ok("璐ф灦缁戝畾绔欑偣鎴愬姛");
}
/*
@@ -118,6 +122,7 @@
@PostMapping("/start/pakin/auth")
@Synchronized
@Transactional
+ @ManagerAuth(memo = "鍚姩鍏ュ簱")
public R startPakin(@RequestBody AgvMobileStartPakin params){
// 缁勬墭
params.getCombParams().forEach(combParam -> {
@@ -134,6 +139,7 @@
*/
@PostMapping("/pakin/empty/auth")
@Synchronized
+ @ManagerAuth(memo = "绌烘澘鍏ュ簱")
public R pakinEmpty(@RequestBody AgvMobileStartParam params){
for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -149,6 +155,7 @@
*/
@PostMapping("/pakout/empty/auth")
@Synchronized
+ @ManagerAuth(memo = "绌烘澘鍑哄簱")
public R pakoutEmpty(@RequestBody AgvMobileStartParam params){
for (AgvMobileStartParam.Pda pda : params.getPad()) {
@@ -159,7 +166,7 @@
}
/*
- 绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+ 绌烘澘鍑哄簱璐ф灦鐮侀�夋嫨
*/
@PostMapping("/pakout/empty/container/selector/auth")
public R containerType(@RequestBody HashMap<String,String> params){
@@ -182,7 +189,8 @@
String matnr = params.get("matnr");
String floor = params.get("floor");
- Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
+
// wrapper.eq("orderNo",orderNo);
@@ -198,7 +206,58 @@
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));
+ // 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
+ if ("JG".equals(orderNo.substring(0,2))) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ } 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(locDetls);
+ }
+
+ /*
+ 鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+ */
+ @PostMapping("/query/locDetl/v2")
+ public R queryAgvLocDetl2(@RequestBody HashMap<String,String> params){
+
+ 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);
+
+
+// wrapper.eq("orderNo",orderNo);
+
+ 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","").eq("floor",1);
+ }
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+ List<AgvLocDetl> locDetls = new ArrayList<>();
+ for (AgvLocDetl agvLocDetl : agvLocDetls) {
+ AgvLocMast agvLocMast = new AgvLocMast();
+ if (Cools.isEmpty(floor)) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
+ } else {
+ // 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
+ if ("JG".equals(orderNo.substring(0,2))) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ } else {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
+ }
}
if (Cools.isEmpty(agvLocMast)) continue;
@@ -215,6 +274,8 @@
鐩樼偣鎺ュ彛
*/
@PostMapping("/check/detl/v1")
+ @ManagerAuth(memo = "搴撳瓨鐩樼偣")
+ @Synchronized
public R checkLocDetl(@RequestBody HashMap<String,String> param){
String locNo = param.get("locNo");
@@ -242,6 +303,8 @@
鐩樼偣搴撲綅閿欎贡缁存姢鎺ュ彛
*/
@PostMapping("/update/detl/v1")
+ @ManagerAuth(memo = "绾犳搴撲綅")
+ @Synchronized
public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
String locNo = param.get("locNo");
String containerCode = param.get("containerCode");
@@ -323,7 +386,7 @@
}
if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
- return R.ok("璇ュ簱浣嶄笌瀹瑰櫒搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
+ return R.ok("璇ュ簱浣嶄笌璐ф灦搴撳瓨涓�鑷达紝鏃犻渶缁存姢");
}
@@ -364,6 +427,7 @@
@PostMapping("/agv/v1/locMove")
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ @Synchronized
public R agvLocMove(@RequestBody HashMap<String,Object> params){
String fl = String.valueOf(params.get("floor"));
short floor =(short)Integer.parseInt(fl.substring(0, 1));
@@ -400,6 +464,7 @@
@PostMapping("/agv/v2/locMove")
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
+ @Synchronized
public R agvLocMove2(@RequestBody HashMap<String,Object> params){
Date now = new Date();
String fl = String.valueOf(params.get("floor"));
@@ -412,6 +477,11 @@
if (mT.equals("unAuto")) {
moveType = "2";
ioType = 111;
+ //int count = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>().eq("io_type", ioType));
+ //if (count>3){
+ // log.equals("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒锛侊紒褰撳墠闄愬埗鏁伴噺3鏉★紝闄愬埗鏉′欢锛歩o_type = 111");
+ // throw new CoolException("111浠诲姟鍫靛锛岀◢鍚庡啀璇曪紒");
+ //}
} else {
moveType = "1";
ioType = 108;
@@ -419,6 +489,14 @@
for (HashMap<String, String> map : dbList) {
String locNo = map.get("locNo");
String barcode = map.get("suppCode");
+ AgvWrkMast source_loc_no = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locNo));
+ if (!Cools.isEmpty(source_loc_no)) {
+ throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
+ }
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
+ if (Cools.isEmpty(locMastS)) {
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
+ }
AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
// 鍚屾璋冩嫧鍗�
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
@@ -453,6 +531,7 @@
@PostMapping("/hand/control/locMove")
@Transactional
@ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
+ @Synchronized
public R handControlLocMove(@RequestBody LocMoveParam param){
agvMobileService.handControlLocMove(param, getUserId());
return R.ok();
@@ -461,6 +540,7 @@
@PostMapping("/hand/control/allocationOut")
@Transactional
@ManagerAuth(memo = "璋冩嫧绂诲満")
+ @Synchronized
public R allocationOut(@RequestBody AgvMobileStartPakin param){
agvMobileService.allocationOut(param, getUserId());
return R.ok();
@@ -469,8 +549,57 @@
@PostMapping("/hand/control/allocationIn")
@Transactional
@ManagerAuth(memo = "璋冩嫧杩涘満")
+ @Synchronized
public R allocationIn(@RequestBody AgvMobileStartPakin param){
agvMobileService.allocationIn(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/empOut")
+ @Transactional
+ @ManagerAuth(memo = "绌烘灦绂诲満")
+ @Synchronized
+ public R empOut(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.empOut(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/empIn")
+ @Transactional
+ @ManagerAuth(memo = "绌烘灦杩涘満")
+ @Synchronized
+ public R empIn(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.empIn(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/doBack")
+ @Transactional
+ @ManagerAuth(memo = "绔欑偣鍥為��")
+ @Synchronized
+ public R doBack(@RequestBody AgvMobileStartPakin param){
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖");
+ }
+ agvMobileService.doBack(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/handBack")
+ @Transactional
+ @ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
+ @Synchronized
+ public R handBack(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.handBack(param, getUserId());
+ return R.ok();
+ }
+
+ @PostMapping("/hand/control/processed")
+ @Transactional
+ @ManagerAuth(memo = "纭鍔犲伐瀹屾垚")
+ @Synchronized
+ public R processed(@RequestBody AgvMobileStartPakin param){
+ agvMobileService.processed(param, getUserId());
return R.ok();
}
@@ -508,9 +637,9 @@
wrkMast.setSourceLocNo(sourceLocNo);
//鐩爣绔欑偣
wrkMast.setLocNo(locNo);
- //瀹瑰櫒缂栫爜
+ //璐ф灦缂栫爜
wrkMast.setBarcode(barcode);
- //瀹瑰櫒绫诲瀷
+ //璐ф灦绫诲瀷
wrkMast.setWhsType(containerType);
// 鐩爣妤煎眰
wrkMast.setCrnNo(floor);
--
Gitblit v1.9.1