#
vincentlu
7 天以前 1a10351db6c122cc73779e8fec1b0b7c53c3624f
#
2个文件已修改
16 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/SiemensConveyorStationService.java
@@ -108,8 +108,7 @@
        return true;
    }
    private HttpResult<List<ConveyorStaDto>> postForResult(String url
            , Map<String, String> headers, Map<String, Object> params) throws Exception {
    private HttpResult<List<ConveyorStaDto>> postForResult(String url, Map<String, String> headers, Map<String, Object> params) throws Exception {
        String json = JSON.toJSONString(params);
        HttpGo.HttpResponse response = this.http.postJson(url, headers, json);
zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java
@@ -45,6 +45,12 @@
    }
    public boolean reportFinished(Task task) {
        if (Cools.isEmpty(task)) {
            return false;
        }
        if (!uplinkProperties.getEnabled()) {
            return false;
        }
        // block
//        Future<R> future = threadPoolRegulator.getInstance().submit(() -> {
//            mapDataDispatcher.modifyDynamicMatrix(null, null, param.getAgvNo(), true);
@@ -78,14 +84,15 @@
                return false;
            }
        } catch (Exception e) {
            log.error("");
            log.error("Uplink report failed, taskId={}",
                    JSON.toJSONString(task),
                    e);
            return false;
        }
        return true;
    }
    private HttpResult<?> postForResult(String url
            , Map<String, String> headers, Map<String, Object> params) throws Exception {
    private HttpResult<?> postForResult(String url, Map<String, String> headers, Map<String, Object> params) throws Exception {
        String json = JSON.toJSONString(params);
        HttpGo.HttpResponse response = this.http.postJson(url, headers, json);