no message

skyouc

7 天以前 c828579bf44bf5b2ded4c04b16670be71cc76514

no message

 src/main/java/com/zy/core/network/real/ZyStationV3RealConnect.java

@@ -185,10 +185,10 @@
                    sb.append("右超宽报警;");
                }
                if(status1[2]) {
                    sb.append("前超长报警;");
                    sb.append("前后超长报警;");
                }
                if(status1[3]) {
                    sb.append("后超长报警;");
                    sb.append("前后超长报警;");
                }
                if(status1[4]) {
                    sb.append("超高报警;");

 src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java

@@ -225,7 +225,7 @@
                    sb.append("前超长报警;");
                }
                if(status1[3] || status2[3]) {
                    sb.append("后超长报警;");
                    sb.append("前后超长报警;");
                }
                if(status1[4] || status2[4]) {
                    sb.append("超高报警;");

 src/main/java/com/zy/core/plugin/NormalProcess.java

@@ -66,6 +66,7 @@

        //堆垛机任务执行完成，按 lane 串行提交
        crnOperateUtils.submitCrnIoExecuteFinishTasks(DISPATCH_INTERVAL_MS);

        // 检测入库任务是否已经到达目标站台
        stationOperateProcessUtils.submitInboundStationArrivalTasks(DISPATCH_INTERVAL_MS);
        //执行输送站点入库任务，按 lane 串行提交
@@ -127,8 +128,9 @@
                        continue;
                    }
                    MessageQueue.offer(SlaveType.Devp, basDevp.getDevpNo(), new Task(2, command));
                    News.taskInfo(stationProtocol.getTaskNo(), "{}扫码异常，已退回至{}", backStation.getStationId());
                    News.taskInfo(stationProtocol.getTaskNo(), "{}异常，已退回至{}", backStation.getStationId());
                    redisUtil.set(RedisKeyType.GENERATE_STATION_BACK_LIMIT.key + stationProtocol.getTaskNo(), 10);
                    continue;
                }

                if (!canSubmitGenerateStoreTask(basDevp, stationThread, stationObjModel, stationProtocol)) {

 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java

@@ -398,7 +398,15 @@
            }

            Map<Integer, StationProtocol> stationProtocolMap = stationThread.getStatusMap();
            StationProtocol stationProtocol = stationProtocolMap.get(stationObjModel.getStationId());

            //获取当前任务堆垛机任务站台
            Integer staNo = wrkMast.getSourceStaNo();
            Integer stationId = stationObjModel.getStationId();
            StationProtocol stationProtocol = stationProtocolMap.get(staNo);

           if (!staNo.equals(stationId)) {
               continue;
           }
            if (stationProtocol == null) {
                continue;
            }

 src/main/resources/application.yml

@@ -27,7 +27,7 @@
      validation-timeout: 3000
      connection-test-query: select 1
    driver-class-name: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://192.168.10.240:3306/nbtlwcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.10.239:3306/nbtlwcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: zy@123
  mvc: