From 56b6f93fbf3e1d5b27676a1d6ad34dc5c626249a Mon Sep 17 00:00:00 2001
From: dubin <dubin@163.com>
Date: 星期二, 27 五月 2025 15:58:16 +0800
Subject: [PATCH] 电视机ip配置和wcs监控图
---
src/main/java/com/zy/asrs/controller/OpenController.java | 519 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 276 insertions(+), 243 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 87db6bc..fb74bc6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
+import com.zy.core.model.DevpSlave;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -61,89 +62,7 @@
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")
- @Transactional
- public R taskCreate(@RequestHeader String appkey,
- @RequestBody List<TaskCreateParam> param1,
- HttpServletRequest request) {
- auth(appkey, param1, request);
- try{
- List<TaskCreateParam> paramList = new ArrayList<>();
- List<String> locNoList = new ArrayList<>();
- for (TaskCreateParam param : param1) {
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
- }
- String locNo=null;
- if(param.getIoType()==1){
- locNo=param.getTargetPoint();
- }else{
- locNo=param.getStartPoint();
- }
- try{
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", locNo).ne("loc_sts","X"));
- if (Cools.isEmpty(locMast)){
- log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
- return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
- }
- }catch (Exception e){
- log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
- return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
- }
- LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts","F")
- .eq("loc_no",locNo)
- .eq("barcode",param.getBarcode()));
- if(Cools.isEmpty(locMast)){
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
- }
- if (!locNoList.contains(locMast.getLocNo())){
- locNoList.add(locMast.getLocNo());
- paramList.add(param);
- }else {
- return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
- }
- }
- for (TaskCreateParam param : paramList){
- openService.taskCreate(param);
- }
- }catch (Exception e){
- log.error("浠诲姟涓嬪彂寮傚父"+e);
- return R.error();
- }
- return R.ok();
- }
//鏌ヨ浠诲姟璇︽儏
@GetMapping("/queryTask")
@@ -158,59 +77,6 @@
return R.ok().add(taskWrk);
}
- //鍙栨斁璐х敵璇�
- @PostMapping("/pick/and/place/v1")
- @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
- public R getAgvPickAndPlaceV1(@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.getStaNo())){
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())){
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV1(param);
- }
-
- //鍙栨斁璐у畬鎴愬弽棣�
- @PostMapping("/pick/and/place/v2")
- @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
- public R getAgvPickAndPlaceV2(@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.getStaNo())){
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())){
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV2(param);
- }
-
- //鏌ヨ浠诲姟鎸囦护闆嗗悎
- @GetMapping("/queryTaskCommand")
- public R queryTaskCommand(@RequestHeader String appkey,
- @RequestParam String taskNo,
- HttpServletRequest request) {
- auth(appkey, taskNo, request);
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error("浠诲姟涓嶅瓨鍦�");
- }
-
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskNo);
- return R.ok().add(commandInfos);
- }
-
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
@@ -222,99 +88,6 @@
}
}
- //AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
- @PostMapping("/targetWharfApply")
- @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
- 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);
- 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())){
- return R.error("璇锋眰绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWharfCode())){
- return R.error("鐮佸ご缂栧彿涓虹┖锛�");
- }
-
- Map<String,Integer> map = new HashMap<>();
- map.put("J-1102",102);map.put("J-1101",101);
- map.put("J-1103",105);map.put("J-1104",106);
- map.put("J-1105",109);map.put("J-1106",110);
- map.put("J-1107",113);map.put("J-1108",114);
- map.put("J-1109",117);map.put("J-1110",118);
- map.put("J-1111",121);map.put("J-1112",122);
- 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")
@@ -326,24 +99,24 @@
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (CarryParam param:params){
if (Cools.isEmpty(param)){
- map.put("Code","0");
- map.put("Msg","鍙傛暟涓虹┖锛�");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage","鍙傛暟涓虹┖锛�");
return map;
} else if (Cools.isEmpty(param.getTaskNo())){
- map.put("Code","0");
- map.put("Msg","浠诲姟鍙蜂负绌猴紒");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage","浠诲姟鍙蜂负绌猴紒");
return map;
} else if (Cools.isEmpty(param.getStereoscopicTaskType())){
- map.put("Code","0");
- map.put("Msg","浠诲姟绫诲瀷涓虹┖锛�");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage","浠诲姟绫诲瀷涓虹┖锛�");
return map;
}
String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
param.setStartPoint(fusion);
LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
if(Cools.isEmpty(locMast)){
- map.put("Code","0");
- map.put("Msg","鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage","鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
return map;
}
@@ -356,12 +129,12 @@
.eq("crn_no",locMast.getCrnNo())
.eq("stn_no",param.getTerminalNo()));
if(Cools.isEmpty(staDesc)){
- map.put("Code","0");
- map.put("Msg","鍑哄簱璺姴涓嶅瓨鍦紒");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage","鍑哄簱璺姴涓嶅瓨鍦紒");
return map;
}
r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
- if(r.get("Code").equals("0")){
+ if(r.get("ReturnStatus").equals(1)){
return r;
}
}else if (param.getStereoscopicTaskType() == 3){
@@ -369,7 +142,7 @@
param.setTerminalNo(fusion1);
//绉诲簱浠诲姟鍒涘缓
r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
- if(r.get("Code").equals("0")){
+ if(r.get("ReturnStatus").equals(1)){
return r;
}
}
@@ -382,8 +155,8 @@
,true
);
}
- map.put("Code","1");
- map.put("Msg","ok");
+ map.put("ReturnStatus",0);
+ map.put("ErrorMessage","ok");
return map;
}
@@ -449,6 +222,7 @@
HashMap<String,Object> map=new HashMap<>();
List<CrnStatusParam> crnStatusParams=new ArrayList<>();
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp:basCrnps){
CrnStatusParam crnStatusParam=new CrnStatusParam();
crnStatusParam.setCrnNo(basCrnp.getCrnNo());
@@ -462,7 +236,18 @@
}
crnStatusParams.add(crnStatusParam);
}
-
+ for (BasDevp basDevp : basDevps) {
+ CrnStatusParam crnStatusParam=new CrnStatusParam();
+ crnStatusParam.setDevpNo(basDevp.getDevNo());
+ crnStatusParam.setOutEnable(basDevp.getOutEnable());
+ crnStatusParam.setInEnable(basDevp.getInEnable());
+ if(!Cools.isEmpty(basDevp.getAutoing())&&basDevp.getAutoing().equals("Y")){
+ crnStatusParam.setCrnSts(3);
+ }else{
+ crnStatusParam.setCrnSts(2);
+ }
+ crnStatusParams.add(crnStatusParam);
+ }
map.put("ReturnStatus",0);
map.put("ErrorMessage","");
map.put("data",crnStatusParams);
@@ -515,4 +300,252 @@
}
}
+ //AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
+// @PostMapping("/targetWharfApply")
+// @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
+// 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);
+// 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())){
+// return R.error("璇锋眰绫诲瀷涓虹┖锛�");
+// } else if (Cools.isEmpty(param.getWharfCode())){
+// return R.error("鐮佸ご缂栧彿涓虹┖锛�");
+// }
+//
+// Map<String,Integer> map = new HashMap<>();
+// map.put("J-1102",102);map.put("J-1101",101);
+// map.put("J-1103",105);map.put("J-1104",106);
+// map.put("J-1105",109);map.put("J-1106",110);
+// map.put("J-1107",113);map.put("J-1108",114);
+// map.put("J-1109",117);map.put("J-1110",118);
+// map.put("J-1111",121);map.put("J-1112",122);
+// 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("/pick/and/place/v2")
+// @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
+// public R getAgvPickAndPlaceV2(@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.getStaNo())){
+// return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getType())){
+// return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+// }
+// return openService.getAgvPickAndPlaceV2(param);
+// }
+
+
+ //鍙栨斁璐х敵璇�
+// @PostMapping("/pick/and/place/v1")
+// @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
+// public R getAgvPickAndPlaceV1(@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.getStaNo())){
+// return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getType())){
+// return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+// }
+// return openService.getAgvPickAndPlaceV1(param);
+// }
+
+ //鏌ヨ浠诲姟鎸囦护闆嗗悎
+// @GetMapping("/queryTaskCommand")
+// public R queryTaskCommand(@RequestHeader String appkey,
+// @RequestParam String taskNo,
+// HttpServletRequest request) {
+// auth(appkey, taskNo, request);
+// TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+// if (taskWrk == null) {
+// return R.error("浠诲姟涓嶅瓨鍦�");
+// }
+//
+// List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskNo);
+// return R.ok().add(commandInfos);
+// }
+
+ //鍒涘缓浠诲姟
+// @PostMapping("/taskCreate")
+// @Transactional
+// public HashMap<String, Object> taskCreate(@RequestHeader String appkey,
+// @RequestBody List<TaskCreateParam> param1,
+// HttpServletRequest request) {
+// auth(appkey, param1, request);
+// HashMap<String, Object> map = new HashMap<>();
+//
+// try{
+// List<TaskCreateParam> paramList = new ArrayList<>();
+// List<String> locNoList = new ArrayList<>();
+// for (TaskCreateParam param : param1) {
+// if (Cools.isEmpty(param)) {
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage",BaseRes.PARAM);
+// return map;
+// }
+// if (Cools.isEmpty(param.getTaskNo())) {
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+// return map;
+// }
+// if (Cools.isEmpty(param.getIoType())) {
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+// return map;
+// }
+// if (Cools.isEmpty(param.getBarcode())) {
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","鏉＄爜[barcode]涓嶈兘涓虹┖");
+// return map;
+// }
+// String locNo=null;
+// if(param.getIoType()==1){
+// locNo=param.getTargetPoint();
+// }else{
+// locNo=param.getStartPoint();
+// }
+// try{
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_no", locNo).ne("loc_sts","X"));
+// if (Cools.isEmpty(locMast)){
+// log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","搴撲綅鍙蜂笉瀛樺湪"+locNo);
+// return map;
+// }
+// }catch (Exception e){
+// log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+// return map;
+// }
+// LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+// .eq("loc_sts","F")
+// .eq("loc_no",locNo)
+// .eq("barcode",param.getBarcode()));
+// if(Cools.isEmpty(locMast)){
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+// return map;
+// }
+// if (!locNoList.contains(locMast.getLocNo())){
+// locNoList.add(locMast.getLocNo());
+// paramList.add(param);
+// }else {
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
+// return map;
+// }
+// }
+// for (TaskCreateParam param : paramList){
+// openService.taskCreate(param);
+// }
+// }catch (Exception e){
+// log.error("浠诲姟涓嬪彂寮傚父"+e);
+// map.put("ReturnStatus",1);
+// map.put("ErrorMessage","鏈嶅姟鍣ㄩ敊璇�");
+// return map;
+// }
+// map.put("ReturnStatus",0);
+// map.put("ErrorMessage","OK");
+// return R.ok();
+// }
+
+ //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();
+// }
}
--
Gitblit v1.9.1