From 29bb1c46cbca730c552f02b3fbe46ea53560f95f Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期三, 14 五月 2025 14:09:25 +0800 Subject: [PATCH] 初始化 --- src/main/java/com/zy/asrs/entity/TaskWrk.java | 2 src/main/java/com/zy/asrs/controller/OpenController.java | 504 +++++++++++++++++++++++++++++-------------------------- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 5 src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java | 9 src/main/resources/application-prod.yml | 4 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 13 6 files changed, 276 insertions(+), 261 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..bcee72f 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -61,89 +61,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 +76,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 +87,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 +98,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 +128,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 +141,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 +154,8 @@ ,true ); } - map.put("Code","1"); - map.put("Msg","ok"); + map.put("ReturnStatus",0); + map.put("ErrorMessage","ok"); return map; } @@ -515,4 +287,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(); +// } } diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java index b2f7261..614a0ed 100644 --- a/src/main/java/com/zy/asrs/entity/TaskWrk.java +++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java @@ -71,7 +71,7 @@ /** * 浠诲姟绫诲瀷 */ - @ApiModelProperty(value= "浠诲姟绫诲瀷") + @ApiModelProperty(value= "浠诲姟绫诲瀷 1:鍏ュ簱 2:鍑哄簱 3:绉诲簱") @TableField("io_type") private Integer ioType; diff --git a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java b/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java index e8987e5..ab62548 100644 --- a/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java +++ b/src/main/java/com/zy/asrs/entity/param/StorageEscalationParam.java @@ -7,12 +7,13 @@ //鎵樼洏鐮� private String BoxNo; //鎵ц鐘舵�� 0锛氭垚鍔� 1锛氬け璐� - private Integer WCSStatus=0; + private Integer WCSStatus = 0; //閿欒淇℃伅 鍏蜂綋鐨勯敊璇俊鎭紙瓒呴珮锛岃秴閲嶇瓑锛� - private String WCSErrorMessage=""; + private String WCSErrorMessage = ""; //鏄惁婊℃澘 1婊℃澘 0绌烘澘 - private int StaType=1; + private int StaType = 1; //搴撲綅绫诲瀷 1楂樺簱浣� 0浣庡簱浣� - private int LocType=0; + private int LocType = 0; + //绔欑偣 private int TerminalNo = 0; } diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index d862449..0d945f2 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -1771,7 +1771,6 @@ private TaskWrk createTask1(Result result, String barcode,Integer staNo) { String locNo = Utils.Fusion(result.getRow(), result.getFloor(), result.getColumn()); - Date now = new Date(); TaskWrk taskWrk = new TaskWrk(); int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙� @@ -1779,11 +1778,9 @@ taskWrk.setWrkNo(workNo1); taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹 taskWrk.setCreateTime(now); - taskWrk.setIoType(1);//浠诲姟绫诲瀷 + taskWrk.setIoType(1);//浠诲姟绫诲瀷 鍏ュ簱 taskWrk.setIoPri(13);//浼樺厛绾� taskWrk.setBarcode(barcode);//鏉$爜 - LocMast locMast = locMastService.selectByLocNo(locNo); - taskWrk.setCrnNo(locMast.getCrnNo()); taskWrk.setTargetPoint(locNo); taskWrk.setStartPoint(staNo+""); taskWrk.setCrnNo(Integer.valueOf(result.getAlley()));//鍫嗗灈鏈哄彿 diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index f2d45cb..3cf81fc 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -70,8 +70,8 @@ HashMap<String,Object> map=new HashMap<>(); TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo()); if (taskWrk != null) { - map.put("Code","0"); - map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�"); + map.put("ReturnStatus",1); + map.put("ErrorMessage",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�"); return map; } @@ -90,6 +90,7 @@ } } } catch (Exception e) { + } taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷 taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾� @@ -123,12 +124,12 @@ } if (!taskWrkService.insert(taskWrk)) { - map.put("Code","0"); - map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�"); + map.put("ReturnStatus",1); + map.put("ErrorMessage",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�"); return map; } - map.put("Code","1"); - map.put("Msg","ok"); + map.put("ReturnStatus",0); + map.put("ErrorMessage","ok"); return map; } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index bcfb659..9fc070b 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -202,10 +202,6 @@ staNo: 1052 backSta: 1051 barcode: ${wcs-slave.barcode[2].id} - inSta[1]: #鍏ュ簱鍙�2 #绌烘澘鍏ュ簱鍙�0 - staNo: 1058 - backSta: 1053 - barcode: ${wcs-slave.barcode[2].id} outSta[0]: #鍑哄簱鍙�1 staNo: 1053 devp[3]: #杈撻�佺嚎--鎴愬搧2F -- Gitblit v1.9.1