#

Junjie

4 天以前 b62481bc477f01b449f0369c9a553d3d9e298dd0

#

 src/main/java/com/zy/asrs/domain/enums/NotifyMsgType.java

@@ -18,6 +18,8 @@
    DUAL_CRN_OUT_TASK_COMPLETE("dual_crn_out_task_complete", "双工位堆垛机出库任务执行完成"),
    DUAL_CRN_TRANSFER_TASK_RUN("dual_crn_transfer_task_run", "双工位堆垛机移库任务执行中"),
    DUAL_CRN_TRANSFER_TASK_COMPLETE("dual_crn_transfer_task_complete", "双工位堆垛机移库任务执行完成"),

    STATION_OUT_TASK_RUN("station_out_task_run","输送站点出库任务运行中"),
    ;

    public String flag;

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

@@ -67,7 +67,7 @@

        //执行堆垛机任务
        crnOperateUtils.crnIoExecute();
        //堆垛机任务执行完成-具备仿真能力
        //堆垛机任务执行完成
        crnOperateUtils.crnIoExecuteFinish();
        //执行输送站点入库任务
        stationOperateProcessUtils.stationInExecute();

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

@@ -4,8 +4,10 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.NotifyMsgType;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.entity.FindCrnNoResult;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -43,6 +45,8 @@
    private LocMastService locMastService;
    @Autowired
    private WmsOperateUtils wmsOperateUtils;
    @Autowired
    private NotifyUtils notifyUtils;

    //执行输送站点入库任务
    public synchronized void stationInExecute() {
@@ -231,6 +235,7 @@
                    wrkMast.setIoTime(new Date());
                    if (wrkMastService.updateById(wrkMast)) {
                        MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
                        notifyUtils.notify(String.valueOf(SlaveType.Devp), stationObjModel.getDeviceNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.STATION_OUT_TASK_RUN, null);
                        News.info("输送站点出库命令下发成功，站点号={}，工作号={}，命令数据={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);