From f6e955d57bf5e885afde54a8c6eefe80bc1bec26 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 十一月 2023 17:00:06 +0800
Subject: [PATCH] #出入库任务下发
---
src/main/java/com/zy/asrs/controller/OpenController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1ad9267..316e934 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,27 +1,31 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.*;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Slf4j
@RestController
@@ -39,11 +43,32 @@
@Autowired
private BasDevpService basDevpService;
+ @Value("${wms.url}")
+ private String wmsUrl;
+
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ //agv浠诲姟瀹屾垚
+ @PostMapping("/toAgvTaskOver")
+ public R getAgvTaskOver(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getWharfCode())){
+ return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStatus())){
+ return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
+ }
+ openService.getAgvTaskOver(param);
+ return R.ok();
+ }
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
@@ -110,7 +135,9 @@
@PostMapping("/targetWharfApply")
public R targetWharfApply(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) {
+ HttpServletRequest request) throws IOException {
+ auth(appkey,param,request);
+
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -122,12 +149,8 @@
} else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
}
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
-
- if (Cools.isEmpty(taskWrk)){
- return R.error("鏈煡璇㈠埌浠诲姟锛屼换鍔″彿锛�"+param.getTaskNo());
- }
- return R.ok(taskWrk.getStartPoint());
+ R r = openService.AgvToWCSToWms(param);
+ return r;
}
//AGV璇锋眰鍔ㄤ綔鎺ュ彛
@@ -135,6 +158,7 @@
public R agvTaskRequest(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getRequestType())){
@@ -143,12 +167,20 @@
return R.error("鐮佸ご缂栧彿涓虹┖锛�");
}
+ Map<String,Integer> map = new HashMap<>();
+ map.put("J-1101",102);map.put("J-1102",101);
+ map.put("J-1103",106);map.put("J-1104",105);
+ map.put("J-1105",110);map.put("J-1106",109);
+ map.put("J-1107",114);map.put("J-1108",113);
+ map.put("J-1109",118);map.put("J-1110",117);
+ map.put("J-1111",122);map.put("J-1112",121);
+
try{
- BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
+ BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
return R.ok();
}else {
- return R.error();
+ return R.error("绔欑偣鐘舵�佷笉鍙叆");
}
}catch (Exception e){
log.error("AGV璇锋眰鍔ㄤ綔鎺ュ彛鎶ラ敊:"+e);
--
Gitblit v1.9.1