From b42da56f5b8fa7a2c7b78485142ed96ac4ea3571 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 10 十一月 2024 13:58:59 +0800
Subject: [PATCH] 修改堆垛机库出入库限制
---
src/main/java/com/zy/asrs/controller/MobileController.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 71de5e5..03c10e7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -26,7 +25,6 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
-import java.util.List;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -67,17 +65,40 @@
@PostMapping("/agv/start")
@ManagerAuth
public R pdaAgvStart(@RequestBody Map<String,Object> map){
- HashMap<String, String> map1 = new HashMap<>();
- map1.put("agv0001","sta0001");
- String sta = map.get("sta").toString();
- ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
- getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
- String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
- if ("SUCCESS".equals(request)) {
- return R.ok();
+ if (Cools.isEmpty(map.get("sta"))) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ } else if (Cools.isEmpty(map.get("inSta"))) {
+ return R.parse("鍏ュ簱绔欑偣涓嶈兘涓虹┖");
}
- return R.error();
+// HashMap<String, String> map1 = new HashMap<>();
+// map1.put("agv0001","sta0001");
+// String sta = map.get("sta").toString();
+//
+// ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+// getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
+// String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
+// if ("SUCCESS".equals(request)) {
+// return R.ok();
+// }
+ String sta = (String) map.get("sta"); // 鏆傚瓨浣�
+ String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣
+
+ return mobileService.inLocCallAgv(sta, inSta);
+
+ }
+
+ @PostMapping("/agv/unbind")
+ @ManagerAuth
+ public R pdaAgvUnbind(@RequestBody Map<String,Object> map){
+
+ String site = (String) map.get("site"); // 鏆傚瓨浣�
+
+ if (Cools.isEmpty(site)) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ }
+
+ return mobileService.unbind(site);
}
private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
@@ -248,8 +269,22 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
+ 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));
+ if (Cools.isEmpty(wrkMast)) {
+ mobileService.comb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }else {
+ mobileService.mergeComb(combParam, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
+
+
}
@RequestMapping("/pack/get/auth")
--
Gitblit v1.9.1