1

zhang

昨天 6831504a0ece1c073b65873757905936b533f2d9

1

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

@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core;

import com.zy.acs.common.utils.News;
import com.zy.acs.conveyor.core.properties.CtuOperationConfig;
import com.zy.acs.conveyor.core.properties.CtuServiceProperties;
import com.zy.acs.conveyor.core.properties.SystemProperties;
@@ -32,6 +33,11 @@

    private final AtomicBoolean running = new AtomicBoolean(false);

    private long lastDbUpdateTime = 0;


    private static final int LOG_INTERVAL_MS = 30000;

    @PostConstruct
    public void init() {
        // 初始化线程池
@@ -57,15 +63,16 @@
            log.debug("系统未运行或服务已停止，跳过输送线任务处理");
            return;
        }

        long currentTime = System.currentTimeMillis();
        if (currentTime - lastDbUpdateTime > LOG_INTERVAL_MS) {
            News.info("执行输送线操作");
            lastDbUpdateTime = currentTime;
        }
        try {
            // 执行配置的操作序列
            for (CtuOperationConfig config : properties.getOperations()) {
                //log.info("执行输送线操作: {}", config.getType());
                operationExecutor.execute(config);
            }

            //log.info("输送线任务处理完成");
        } catch (Exception e) {
            log.error("输送线任务处理异常", e);
        }

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

@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation.handler;

import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.ApplyInDto;
import com.zy.acs.conveyor.controller.vo.ApplyInRepsonseDto;
@@ -82,7 +83,8 @@
                    if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                        String barcode = staProtocol.getBarcode();
                        if (Cools.isEmpty(barcode)) {
                            log.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            News.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            //log.error("站点：{}，未扫到码值：{}", staProtocol.getSiteId(), barcode);
                            return;
                        }
                        // 9991是空板，9992是满板
@@ -97,10 +99,12 @@
                                    staProtocol.setStaNo(inSta.getTargetSta());
                                    redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                                    if (jobService.insert(initJob(locOfWms, barcode, workNo, inSta.getTargetSta() + ""))) {
                                        log.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());
                                        News.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());
                                        //log.info("申请入库成功，条码：{},站点：{}", barcode, inSta.getStaNo());
                                    }
                                } else {
                                    log.info("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                    News.error("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                    //log.info("WMS未返回库位信息，条码：{},站点：{}", barcode, inSta.getStaNo());
                                }
                            }
                        }

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

@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation.handler;

import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
@@ -72,10 +73,10 @@
                            staProtocol.setStaNo(0);
                            redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);

                            log.info("" + config.getMark() + "站点清空失败：{},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
                            job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
                            jobService.updateById(job);

                            //log.info("" + config.getMark() + "站点清空：{},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
                            News.info("" + config.getMark() + "站点清空：{},{}", takeSta.getStaNo(), staProtocol.getWorkNo());
                        }
                    }
                }

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

@@ -1,5 +1,6 @@
package com.zy.acs.conveyor.core.operation.handler;

import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
@@ -70,14 +71,16 @@
                    // 判断是否满足条件
                    if (!staProtocol.isLoading()) {
                        if (staProtocol.getWorkNo() > 0) {
                            log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                            News.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                            //log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                        }
                        continue;
                    }

                    if (staProtocol.isAutoing() && staProtocol.getWorkNo() == 0) {
                        if (staProtocol.isInEnable()) {
                            log.error("没有可入信号：{}", staProtocol.getSiteId());
                            News.error("没有可入信号：{}", staProtocol.getSiteId());
                            //log.error("没有可入信号：{}", staProtocol.getSiteId());
                            continue;
                        }
                        String seqNum = ctuMainService.checkStationStatus(releaseSta.getStaNo());
@@ -98,7 +101,8 @@
                                log.info("输送线下发：{},{}", staProtocol.getWorkNo(), releaseSta.getTargetSta());
                            }
                        } else {
                            log.info("站点信息不符合入库条件！！！" + " 调用RCS检验未通过,站点：{}", staProtocol.getSiteId());
                            News.error("站点信息不符合入库条件！！！" + " 调用RCS检验未通过,站点：{}", staProtocol.getSiteId());
                            //log.info("站点信息不符合入库条件！！！" + " 调用RCS检验未通过,站点：{}", staProtocol.getSiteId());
                        }
                    }
                }

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

@@ -1,6 +1,7 @@
package com.zy.acs.conveyor.core.operation.handler;


import com.zy.acs.common.utils.News;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.OpenBusSubmitParam;
import com.zy.acs.conveyor.controller.vo.TaskDto;
@@ -73,12 +74,14 @@
                    // 判断是否满足条件
                    if (!staProtocol.isLoading()) {
                        if (staProtocol.getWorkNo() > 0) {
                            log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                            News.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                            //log.error("输送线上有任务号无货，需要人工处理：{}", staProtocol.getSiteId());
                        }
                        continue;
                    }
                    if (staProtocol.getWorkNo() == 0) {
                        log.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                        News.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                        //log.error("输送线上有货无任务号，需要人工处理：{}", staProtocol.getSiteId());
                        continue;
                    }
                    if (staProtocol.isAutoing()) {
@@ -94,7 +97,7 @@
                            }
                        }
                    } else {
                        log.error("输送线为自动，需要开启：{}", staProtocol.getSiteId());
                        log.error("输送线未自动，需要开启：{}", staProtocol.getSiteId());
                    }
                }
            }