#
zjj
2024-07-19 93f593447ba1dfe230a0c5b3b4ea580938bca5ca
#
2个文件已修改
64 ■■■■■ 已修改文件
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -483,6 +483,34 @@
            task.setUpdateTime(new Date());
            if (!taskService.updateById(task)) {
                News.error("更新工作档失败!!! [工作号:{}]", task.getTaskNo());
            }else {
                if ("06YZ".equals(task.getMemo().substring(0,4))){
                    String response = "";
                    Map<String, Object> headers = new HashMap<>();
                    headers.put("Content-Type", "application/json;charset=UTF-8");
                    headers.put("X-lr-request-id", task.getWmsTaskNo());
                    headers.put("X-lr-version", 4.1);
                    headers.put("X-lr-trace-id", "{{$guid}}");
                    Map<String, Object> map = new HashMap<>();
                    map.put("carrierCode",task.getZpallet());
                    map.put("siteCode",task.getMemo());
                    map.put("extra",null);
                    try {
                        response = new HttpHandler.Builder()
                                .setHeaders(headers)
                                .setUri("172.18.16.248:443")
                                .setHttps(true)
                                .setPath("/rtas/api/robot/controller/carrier/unbind")
                                .setJson(JSONObject.toJSONString(map))
                                .build()
                                .doPost();
                        JSONObject jsonObject = JSON.parseObject(response);
                        log.info("agv解绑箱号,请求体:"+JSONObject.toJSONString(map)+",返回:"+response);
                    }catch (Exception e){
                        log.info("agv解绑箱号请求报错"+e.getMessage());
                    }
                }
            }
        }
    }
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -81,8 +81,11 @@
                continue;
            }
            if (task.getTaskNo().equals(basConveyorSta.getTaskNo().toString())) {
                //绑定托盘码
                boolean httpRequest1 = agvBindBarcodeHttpRequest("", "", task);
                AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
                getOutRequestParam(agvTaskCreateParam,task);
                //发送出库任务
                boolean httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
                if (httpRequest){
                    task.setTaskSts(1000L);
@@ -114,6 +117,39 @@
        agvTaskCreateParam.setCarrierInfo(carrierInfoParam);
    }
    private boolean agvBindBarcodeHttpRequest(String url, String path,Task task){
        String response = "";
        boolean success = false;
        Map<String, Object> headers = new HashMap<>();
        headers.put("Content-Type", "application/json;charset=UTF-8");
        headers.put("X-lr-request-id", task.getWmsTaskNo());
        headers.put("X-lr-version", 4.1);
        headers.put("X-lr-trace-id", "{{$guid}}");
        Map<String, Object> map = new HashMap<>();
        map.put("carrierCode",task.getZpallet());
        map.put("siteCode",task.getMemo());
        map.put("extra",null);
        try {
            response = new HttpHandler.Builder()
                    .setHeaders(headers)
                    .setUri("172.18.16.248:443")
                    .setHttps(true)
                    .setPath("/rtas/api/robot/controller/carrier/unbind")
                    .setJson(JSONObject.toJSONString(map))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            String code = jsonObject.get("code").toString();
            log.info("agv绑定箱号,请求体:"+JSONObject.toJSONString(map)+",返回:"+response);
            if(code.equals("SUCCESS")){
                success = true;
            }
        }catch (Exception e){
            log.info("agv绑定箱号请求报错"+e.getMessage());
        }
        return success;
    }
    private boolean doHttpRequest(AgvTaskCreateParam requestParam, String url, String path){
        String response = "";