1

zhang

昨天 fc976b0bc327a19db87e4b2c140ea5552988312a

1

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java

@@ -25,7 +25,7 @@

@Slf4j
@Component
public class OutOperationHandler implements OperationHandler {
public class OutOperationHandler implements OperationHandler  {

    @Autowired
    private SlaveProperties slaveProperties;
@@ -82,8 +82,7 @@
                        }
                        String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
                        if (seqNum != null) {
                            Job jobBySeqNum = jobService.getJobByTaskNo(seqNum);
                            if (jobBySeqNum == null) {
                            if (jobService.getJobByTaskNo(seqNum) == null) {
                                int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
                                // 下发移动 且 下发plc命令
                                staProtocol.setWorkNo(workNo);
@@ -93,7 +92,7 @@
                                job.setJobNo(workNo);
                                job.setJobSts(ConveyorStateType.OUTBOUND.getStatus());
                                if (!jobService.insert(job)) {
                                    throw new CoolException("插入输送线任务失败," + jobBySeqNum + " - " + workNo);
                                    throw new CoolException("插入输送线任务失败," + seqNum + " - " + workNo);
                                }
                                redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                                log.info("输送线下发：{},{}", staProtocol.getWorkNo(), releaseSta.getTargetSta());

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java

@@ -33,8 +33,6 @@

    private Map<Integer, StaProtocol> station;

    private volatile boolean connected = false;

    private static final int WRITE_RETRY_MAX = 5;

    private static final int WRITE_RETRY_INTERVAL_MS = 200;
@@ -75,7 +73,7 @@
     * 读取状态 ====> 整块plc
     */
    private void read() throws InterruptedException {
        if (!connected || siemensS7Net == null) {
        if (siemensS7Net == null) {
            log.warn("PLC未连接，跳过读取 [id:{}]", slave.getId());
            return;
        }
@@ -90,7 +88,6 @@

        if (!result.IsSuccess) {
            log.error("读取站点状态失败 [id:{}] [error:{}]", slave.getId(), result.Message);
            connected = false;
            return;
        }