1

zhang

9 小时以前 1864f916e0359d0814416cf94feda3a3662ed193

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java

@@ -1093,9 +1093,8 @@
                                ActionTypeType.ReadyTakeFromAgvSite.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now,    // 工作时间
                                destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
                                destSta.getStaNo()
                                now    // 工作时间

                        ));
                        // 计算货叉工作方向
                        staWorkDirection = mapService.calculateAgvWorkDirectionByStation(destStaWorkDirection, lastDirection);
@@ -1112,7 +1111,9 @@
                                ActionTypeType.ReadyReleaseToConveyorSta.val(),    // 动作类型
                                actionPrepareSts,    // 动作进度
                                agvId,    // AGV
                                now    // 工作时间
                                now,    // 工作时间
                                destSta.getStaTypeIsCheck() == 1 ? 2 : 0,
                                destSta.getStaNo()
                        ));
                        break;
                    case TO_CHARGE:
@@ -1699,10 +1700,10 @@

    private boolean askSta(Integer askType, String askSta) {
        log.info("来询问输送线了，{}，{}", askType, askSta);
        String wmsUrl = configService.getVal("WMS_URL", String.class);
        String wmsUrl = configService.getVal("WCS_URL", String.class);
        String wmsPath = configService.getVal("WMS_STA", String.class);
        if (Cools.isEmpty(wmsPath) || Cools.isEmpty(wmsUrl)) {
            return true;
            return false;
        }
        Integer time = configService.getVal("TIMEOUT", Integer.class, 5);
        //Integer times = configService.getVal("REPORT_TIMES", Integer.class, 2);