From 45a87642e46c746802af13bf47bcd70e3b69277a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十二月 2023 16:49:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 214 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 160 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 18c87c4..da56835 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,26 +1,32 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
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
@@ -37,10 +43,39 @@
private TaskWrkController taskWrkController;
@Autowired
private BasDevpService basDevpService;
+ @Autowired
+ private ApiLogService apiLogService;
+
+ @Autowired
+ private StaDescService staDescService;
+
+ @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")
+ @AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
+ 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")
@@ -105,9 +140,12 @@
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
@PostMapping("/targetWharfApply")
+ @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
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())){
@@ -119,16 +157,25 @@
} 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);
+ apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,r.toString()
+ ,true
+ );
+ return r;
}
//AGV璇锋眰鍔ㄤ綔鎺ュ彛
@PostMapping("/agvTaskRequest")
+ @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
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())){
@@ -136,58 +183,115 @@
} 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();
+
+ 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);
+ map.put("H-1102",300);map.put("H-1101",305);
+ map.put("G-1102",400);map.put("G-1101",405);
+// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+// .eq("stn_desc", param.getWharfCode()));
+//
+// if (Cools.isEmpty(staDesc)){
+// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+// }
+ if (Cools.isEmpty(map.get(param.getWharfCode()))){
+ return R.error("鏈煡璇㈠埌绔欑偣");
}
+ BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
+ if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){
+ apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,R.ok().toString()
+ ,true
+ );
+ return R.ok("鍙叆");
+ }else {
+ apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
+ ,true
+ );
+ return R.error("绔欑偣鐘舵�佷笉鍙叆");
+ }
+
+
+
+
+
}
//浠诲姟涓嬪彂鎺ュ彛
@PostMapping("/outboundTaskSend")
+ @Transactional
public R outboundTaskSend(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
+ @RequestBody List<WMSAndAGVInterfaceParam> params,
HttpServletRequest request) {
- 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杞﹂棿
- }
+ auth(appkey, params, request);
+ List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
+ for (WMSAndAGVInterfaceParam param:params){
- openService.taskCreate(new taskCreateParam(param));
+ 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 (!param.getTaskType().equals("YK")){
+ if (Cools.isEmpty(param.getTargetWharf())){
+ return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+ }
+ }
- return R.ok(param);
- }catch (Exception e){
- String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
- return R.ok("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�!"+ errorMsg);
+ StaDesc staDesc = new StaDesc();
+ if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).lt("crn_stn", 200));
+ }else {
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).ge("crn_stn", 200));
+ }
+ param.setTargetLocationCode(staDesc.getStnNo().toString());
+
+
+ R r = openService.taskCreate(new taskCreateParam(param));
+
+ apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,r.toString()
+ ,true
+ );
+ return r;
+
}
+
+ return null;
}
//浠诲姟鍙栨秷鎺ュ彛
@@ -212,20 +316,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("浠诲姟宸叉墽琛屽畬鎴�");
}
@@ -250,4 +354,6 @@
}
}
+
+
}
--
Gitblit v1.9.1