1

Administrator

昨天 14717fd672bc62442175d2ce2ddd3a113f0069b8

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

@@ -6,6 +6,7 @@
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.conveyor.controller.vo.OpenBusSubmitParam;
import com.zy.acs.conveyor.controller.vo.TaskDto;
import com.zy.acs.conveyor.core.constant.RedisConveyorConstant;
import com.zy.acs.conveyor.core.enums.ConveyorStateType;
import com.zy.acs.conveyor.core.model.StaProtocol;
import com.zy.acs.conveyor.core.operation.OperationHandler;
@@ -63,17 +64,17 @@
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                // 遍历入库口
                for (DevpSlave.Sta inSta : devp.getInSta()) {
                for (DevpSlave.Sta sta : devp.getTakeSta()) {
                    // 根据输送线plc遍历
                    Map<Integer, StaProtocol> stationMap = stationService.getStationMap(devp.getId());
                    StaProtocol staProtocol = stationMap.get(inSta.getTargetSta());
                    StaProtocol staProtocol = stationMap.get(sta.getSourceStaNo());
                    if (staProtocol == null) {
                        continue;
                    } else {
                        staProtocol = staProtocol.clone();
                    }
                    // 判断是否满足条件
                    if (!staProtocol.isAutoing()) {
                    if (!staProtocol.isAutoing() ||staProtocol.getWorkNo() ==0) {
                        //News.error("{}：站点：{}，非自动", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
@@ -85,10 +86,7 @@
                        News.error("{},输送线上无货有任务号，需要人工处理站点：{}", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }
                    if (!staProtocol.isInEnable()) {
                        //News.error("{},站点：{},没有可入信号", config.getMark(), staProtocol.getSiteId());
                        continue;
                    }

                    Job jobByJobNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
                    if (jobByJobNo == null) {
                        News.error("{}：站点：{}，找不到任务", config.getMark(), staProtocol.getSiteId());
@@ -106,6 +104,9 @@
                        jobByJobNo.setJobSts(ConveyorStateType.SENDTASK.getStatus());
                        jobByJobNo.setRcsTime(new Date());
                        jobService.updateById(jobByJobNo);
                        staProtocol.setWorkNo(staProtocol.getWorkNo());
                        staProtocol.setStaNo(sta.getTargetSta());
                        redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
                        News.error("{},任务发送给RCS成功,WMS任务号：{},输送线工作号：{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());
                    } else {
                        News.error("{},任务发送给RCS失败,WMS任务号：{},输送线工作号：{}", config.getMark(), jobByJobNo.getTaskNo(), jobByJobNo.getJobNo());