| src/main/java/com/zy/asrs/controller/MobileController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/MobileService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,7 +13,6 @@ import com.zy.asrs.entity.result.MobileAdjustResult; import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.*; import com.zy.common.constant.ApiInterfaceConstant; import com.zy.common.model.WrkDto; import com.zy.common.service.CommonService; import com.zy.common.utils.HttpHandler; @@ -66,6 +65,12 @@ @PostMapping("/agv/start") @ManagerAuth public R pdaAgvStart(@RequestBody Map<String,Object> map){ if (Cools.isEmpty(map.get("sta"))) { return R.parse("暂存位不能为空"); } else if (Cools.isEmpty(map.get("inSta"))) { return R.parse("入库站点不能为空"); } // HashMap<String, String> map1 = new HashMap<>(); // map1.put("agv0001","sta0001"); // String sta = map.get("sta").toString(); @@ -77,52 +82,10 @@ // return R.ok(); // } String sta = (String) map.get("sta"); // 暂存位 String inSts = "1040"; // 入库站点 String inSta = (String) map.get("inSta"); // 入库站点 ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam(); forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", "")); forwardAGVTaskParam.setTaskTyp("GT3"); forwardAGVTaskParam.setCtnrTyp("2"); forwardAGVTaskParam.setPriority("1"); List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>(); positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(sta,"05")); positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(inSts,"05")); forwardAGVTaskParam.setPositionCodePath(positionCodePathsList); return mobileService.inLocCallAgv(sta, inSta); String body = JSON.toJSONString(forwardAGVTaskParam); String response = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(ApiInterfaceConstant.AGV_IP) .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH) .setJson(body) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); if (jsonObject.getInteger("code").equals(0)) { success = true; } else { log.error("入库呼叫agv失败！！！url：{}；request：{}；response：{}", ApiInterfaceConstant.AGV_IP+ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response); } } catch (Exception e) { log.error("入库呼叫agv异常", e); } finally { try { // 保存接口日志 // apiLogService.save( // "请求仓储MES盘点单上报接口", // MesConstant.MES_CC_IP_PORT + MesConstant.MES_CC_SB_URL, // null, // "127.0.0.1", // JSON.toJSONString(collect), // response, // success // ); } catch (Exception e) { log.error("", e); } } return R.error(); } private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){ src/main/java/com/zy/asrs/service/MobileService.java
@@ -1,6 +1,7 @@ package com.zy.asrs.service; import com.alibaba.fastjson.JSONObject; import com.core.common.R; import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.LocDetl; import com.zy.asrs.entity.OrderDetl; @@ -14,6 +15,11 @@ public interface MobileService { /** * 入库呼叫agv */ R inLocCallAgv(String sta, String inSta); /** * 组托 */ void comb(CombParam param, Long userId); src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -7,14 +7,11 @@ import com.core.common.*; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.CombParam; import com.zy.asrs.entity.param.MobileAdjustParam; import com.zy.asrs.entity.param.OffSaleParam; import com.zy.asrs.entity.param.OpenOrderPakinParam; import com.zy.asrs.entity.param.*; import com.zy.asrs.mapper.ManLocDetlMapper; import com.zy.asrs.service.*; import com.zy.asrs.utils.MatUtils; import com.zy.common.CodeRes; import com.zy.common.constant.ApiInterfaceConstant; import com.zy.common.constant.MesConstant; import com.zy.common.entity.Parameter; import com.zy.common.model.DetlDto; @@ -77,6 +74,59 @@ @Override public R inLocCallAgv(String sta, String inSta) { ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam(); forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", "")); forwardAGVTaskParam.setTaskTyp("GT3"); forwardAGVTaskParam.setCtnrTyp("2"); forwardAGVTaskParam.setPriority("1"); List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>(); positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(sta, "05")); positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(inSta, "05")); forwardAGVTaskParam.setPositionCodePath(positionCodePathsList); String body = JSON.toJSONString(forwardAGVTaskParam); String response = ""; String message = ""; boolean success = false; try { response = new HttpHandler.Builder() .setUri(ApiInterfaceConstant.AGV_IP) .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH) .setJson(body) .build() .doPost(); JSONObject jsonObject = JSON.parseObject(response); jsonObject.getString("message"); if (jsonObject.getInteger("code").equals(0)) { success = true; } else { log.error("入库呼叫agv失败！！！url：{}；request：{}；response：{}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response); } } catch (Exception e) { log.error("入库呼叫agv异常", e); } finally { try { // 保存接口日志 apiLogService.save( "入库呼叫agv", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, null, "127.0.0.1", body, response, success ); } catch (Exception e) { log.error("", e); } } return success ? R.ok("呼叫agv成功") : R.parse(message); } @Override @Transactional public void comb(CombParam param, Long userId) { if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
