#

zwl

昨天 18531a77c4ec92c5fa79c391eccc2769df0c862e

 src/main/java/com/zy/common/service/CommonService.java

@@ -1,5 +1,6 @@
package com.zy.common.service;

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
@@ -12,21 +13,17 @@
import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.Task;
import com.zy.core.model.command.StationCommand;
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.thread.StationThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Random;
import java.util.*;

@Slf4j
@Service
@@ -258,8 +255,10 @@
        wrkMast.setIoType(WrkIoType.IN.id); // 入出库状态： 1.入库
        wrkMast.setIoPri(ioPri);
        wrkMast.setLocNo(param.getLocNo()); // 目标库位
        wrkMast.setSourceStaNo(Integer.valueOf(param.getSourceStaNo()));//源站
        wrkMast.setStaNo(Integer.valueOf(param.getSourceStaNo()));//目标站
        if (!Cools.isEmpty(param.getSourceStaNo())&&!param.getSourceStaNo().equals("null")){
            wrkMast.setSourceStaNo(Integer.valueOf(param.getSourceStaNo()));//源站
        }
        wrkMast.setStaNo(Integer.valueOf(param.getStaNo()));//目标站
        wrkMast.setWmsWrkNo(String.valueOf(param.getTaskNo()));
        wrkMast.setBarcode(param.getBarcode());
        wrkMast.setAppeTime(now);
@@ -269,7 +268,16 @@
        StationCommand command = stationThread.getCommand(StationCommandType.WRITE_INFO,
                wrkMast.getWrkNo(), Integer.valueOf(param.getSourceStaNo()), Integer.valueOf(param.getSourceStaNo()), 0);

        MessageQueue.offer(SlaveType.Devp, 1, new Task(2, command));
        Map<Integer, StationProtocol> statusMap = stationThread.getStatusMap();
        StationProtocol stationProtocol = statusMap.get(command.getStationId());

        JSONObject data = new JSONObject();
        data.put("oldTaskNo", stationProtocol.getTaskNo());
        data.put("newTaskNo", wrkMast.getWrkNo());
        data.put("command", command);
        data.put("stationId", command.getStationId());
        data.put("deviceNo", 1);
        redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + command.getStationId(), JSONObject.toJSONString(data), 60 * 5);

        if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
            wrkMast.setCrnNo(findCrnResult.getCrnNo());