*

lsh

2024-10-19 d2dbc96d29d4560400bc7184e255a305929f53a5

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -9,28 +9,17 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.SortTheExecutionOfTheCarUtil;
import com.zy.asrs.utils.Utils;
import com.zy.core.DevpThread;
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.DevpSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.SteSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.RgvCommand;
import com.zy.core.model.command.SteCommand;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.model.protocol.SteProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
import com.zy.core.thread.SteThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -58,7 +47,7 @@
    @Autowired
    private WrkMastService wrkMastService;
    /**
     * 站点任务检测  下发小车取放任务
     * 站点任务检测  更新小车位置信息
     */
    public synchronized void updateStePosition() {
        try{
@@ -179,6 +168,8 @@
                        break runRgv;
                    }
                    wrkMast.setWrkSts(2L);
                    wrkMast.setRgvNo(rgvProtocol.getRgvNo());
                    wrkMast.setAppeTime(new Date());
                    try{
                        wrkMastService.updateById(wrkMast);
                        continue ;
@@ -225,6 +216,7 @@
                        break;
                    }
                    wrkMast.setWrkSts(3L);
                    wrkMast.setAppeTime(new Date());
                    wrkMastService.updateById(wrkMast);
                }
            }