zjj
2023-11-30 dc9ebf79f7627c39dbbd58481139fda663878dfa
#接口
3个文件已修改
34 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -51,6 +51,7 @@
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};
    //agv任务完成
    @PostMapping("/toAgvTaskOver")
    public R getAgvTaskOver(@RequestHeader String appkey,
                           @RequestBody TaskOverParam param,
@@ -166,12 +167,20 @@
            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);
        try{
            BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
            BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
            if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
                return R.ok();
            }else {
                return R.error();
                return R.error("站点状态不可入");
            }
        }catch (Exception e){
            log.error("AGV请求动作接口报错:"+e);
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -96,13 +96,18 @@
        toWmsDTO.setApplyType("TUNNEL");
        toWmsDTO.setWharfSource(null);
        toWmsDTO.setCanInboundTunnels(list);
        String response = new HttpHandler.Builder()
                .setHeaders(map)
                .setUri(wmsUrl)
                .setPath("wcsManager/wcsInterface/inboundTaskApply")
                .setJson(JSON.toJSONString(toWmsDTO))
                .build()
                .doPost();
        String response = null;
        try {
            response = new HttpHandler.Builder()
                    .setHeaders(map)
                    .setUri(wmsUrl)
                    .setPath("wcsManager/wcsInterface/inboundTaskApply")
                    .setJson(JSON.toJSONString(toWmsDTO))
                    .build()
                    .doPost();
        }catch (Exception e){
            return R.error("wms连接失败"+e.getMessage());
        }
        JSONObject jsonObject = JSON.parseObject(response);
        if (jsonObject.getInteger("code").equals(200)) {
src/main/resources/application.yml
@@ -49,7 +49,7 @@
  # WMS系统ip
  #url: 10.32.53.195:8080
  # WMS系统ip
  url: 172.18.9.56:8080
  url: w.informfengyun.com:58088/prod-api
  # 入库任务申请接口
  inboundTaskApplyPath: api/InterFace/get_InterFace_TestStorage
  # 任务状态反馈接口