From 3b5b98a9911e3231cefe5ab4f47a4c9d94e5a2f7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 十一月 2023 16:15:01 +0800
Subject: [PATCH] #将错误码存入备注字段进行展示
---
src/main/java/com/zy/asrs/controller/OpenController.java | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1576d6c..ed3afdb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,27 +1,30 @@
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.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
@@ -38,6 +41,11 @@
private TaskWrkController taskWrkController;
@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");
@@ -108,7 +116,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())){
@@ -120,9 +130,8 @@
} else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
}
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
-
- return R.ok(taskWrk.getStartPoint());
+ R r = openService.AgvToWCSToWms(param);
+ return r;
}
//AGV璇锋眰鍔ㄤ綔鎺ュ彛
@@ -130,6 +139,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())){
@@ -137,12 +147,19 @@
} else if (Cools.isEmpty(param.getWharfCode())){
return R.error("鐮佸ご缂栧彿涓虹┖锛�");
}
- BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
- if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
- return R.ok();
- }else {
- return R.error();
+
+ try{
+ BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
+ if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+ return R.ok();
+ }else {
+ return R.error();
+ }
+ }catch (Exception e){
+ log.error("AGV璇锋眰鍔ㄤ綔鎺ュ彛鎶ラ敊:"+e);
+ return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
}
+
}
//浠诲姟涓嬪彂鎺ュ彛
@@ -151,6 +168,7 @@
public R outboundTaskSend(@RequestHeader String appkey,
@RequestBody List<WMSAndAGVInterfaceParam> params,
HttpServletRequest request) {
+ auth(appkey, params, request);
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (WMSAndAGVInterfaceParam param:params){
try {
@@ -219,20 +237,20 @@
}
boolean sign =false;
switch (param.getTaskStatus()){
- case "1"://姝ｅ父鍙栨秷
+ case 1://姝ｅ父鍙栨秷
if (taskWrk.getWrkSts()>1){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- case "2"://寮哄埗鍙栨秷
+ case 2://寮哄埗鍙栨秷
if (taskWrk.getWrkSts()>3){
return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
break;
- case "3"://姝ｅ父瀹屾垚
+ case 3://姝ｅ父瀹屾垚
if (taskWrk.getWrkSts()>11){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- case "4"://寮哄埗瀹屾垚
+ case 4://寮哄埗瀹屾垚
if (taskWrk.getWrkSts()>14){
return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
@@ -257,4 +275,6 @@
}
}
+
+
}
--
Gitblit v1.9.1