From 8500e3aa9c836fef5cd4ff2ce54cf3a01a78eef9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 十一月 2023 16:15:14 +0800
Subject: [PATCH] #将错误码存入备注字段进行展示
---
src/main/java/com/zy/asrs/controller/OpenController.java | 190 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 185 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e3b17dc..ed3afdb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,24 +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.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.TaskWrkService;
+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
@@ -31,6 +37,15 @@
private TaskWrkService taskWrkService;
@Autowired
private CommandInfoService commandInfoService;
+ @Autowired
+ 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");
@@ -97,4 +112,169 @@
}
}
+ //AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
+ @PostMapping("/targetWharfApply")
+ public R targetWharfApply(@RequestHeader String appkey,
+ @RequestBody WMSAndAGVInterfaceParam param,
+ HttpServletRequest request) throws IOException {
+ auth(appkey,param,request);
+
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getTaskNo())){
+ return R.error("宸ヤ綔鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getContainerCode())){
+ return R.error("鎵樼洏缂栫爜涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getWharfSource())){
+ return R.error("婧愮爜澶翠负绌猴紒");
+ } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
+ return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
+ }
+ R r = openService.AgvToWCSToWms(param);
+ return r;
+ }
+
+ //AGV璇锋眰鍔ㄤ綔鎺ュ彛
+ @PostMapping("/agvTaskRequest")
+ 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())){
+ return R.error("璇锋眰绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getWharfCode())){
+ 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("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+ }
+
+ }
+
+ //浠诲姟涓嬪彂鎺ュ彛
+ @PostMapping("/outboundTaskSend")
+ @Transactional
+ 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 {
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getTaskNo())){
+ return R.error("浠诲姟鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getTaskType())){
+ return R.error("浠诲姟绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getWarehouseId())){
+ return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
+ }
+ if (Cools.isEmpty(param.getTaskPriority())){
+ param.setTaskPriority(1);
+ }
+ if (Cools.isEmpty(param.getContainerCode())){
+ return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
+ }
+ if (Cools.isEmpty(param.getEmptyContainer())){
+ return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
+ }
+// if (Cools.isEmpty(param.getTaskTunnel())){
+// return R.error("浠诲姟宸烽亾涓虹┖锛�");
+// }
+// if (Cools.isEmpty(param.getGroupNo())){
+// return R.error("浠诲姟缁勪负绌猴紒");
+// }
+// if (Cools.isEmpty(param.getTaskSerialNo())){
+// return R.error("浠诲姟鎵ц椤哄簭涓虹┖锛�");
+// }
+ if (Cools.isEmpty(param.getTargetWharf())){
+ return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+ }
+
+ openService.taskCreate(new taskCreateParam(param));
+
+ params1.add(param);
+// return R.ok(param);
+ }catch (Exception e){
+ String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
+ return R.error("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�!"+ errorMsg);
+ }
+ }
+ return R.ok(params1);
+ }
+
+ //浠诲姟鍙栨秷鎺ュ彛
+ @PostMapping("/taskCancel")
+ public R taskCancel(@RequestHeader String appkey,
+ @RequestBody WMSAndAGVInterfaceParam param,
+ HttpServletRequest request) {
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getTaskNo())){
+ return R.error("宸ヤ綔鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getTaskStatus())){
+ return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
+ }
+// else if (Cools.isEmpty(param.getWarehouseId())){
+// return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
+// }
+
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("task_no", param.getTaskNo()));
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("鏈煡鍒板綋鍓嶄换鍔�");
+ }
+ boolean sign =false;
+ switch (param.getTaskStatus()){
+ case 1://姝ｅ父鍙栨秷
+ if (taskWrk.getWrkSts()>1){
+ return R.error("浠诲姟宸插紑濮嬫墽琛�");
+ }
+ case 2://寮哄埗鍙栨秷
+ if (taskWrk.getWrkSts()>3){
+ return R.error("浠诲姟宸叉墽琛屽畬鎴�");
+ }
+ break;
+ case 3://姝ｅ父瀹屾垚
+ if (taskWrk.getWrkSts()>11){
+ return R.error("浠诲姟宸插紑濮嬫墽琛�");
+ }
+ case 4://寮哄埗瀹屾垚
+ if (taskWrk.getWrkSts()>14){
+ return R.error("浠诲姟宸叉墽琛屽畬鎴�");
+ }
+ sign=true;
+ break;
+ default:
+ return R.error("鏈煡鎿嶄綔");
+ }
+ return taskWrkOperate(taskWrk,sign);
+ }
+
+ //浠诲姟鎿嶄綔
+ private R taskWrkOperate(TaskWrk taskWrk,boolean sign){
+ try{
+ if (sign){//瀹屾垚
+ return taskWrkController.complete(taskWrk.getTaskNo());
+ }else {//鍙栨秷
+ return taskWrkController.cancel(taskWrk.getTaskNo());
+ }
+ }catch (Exception e){
+ return R.error();
+ }
+ }
+
+
+
}
--
Gitblit v1.9.1