初始化

野心家

2025-04-08 01c964b63f8ec9ff6422221c67e72d47b7a685c8

初始化

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

@@ -25,7 +25,6 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
import com.zy.core.enums.DevpType.DevpWorkType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
@@ -126,31 +125,31 @@
                boolean back = false;
                String errMsg = "异常：";
                if (staProtocol.isFrontErr()) {
                    errMsg = errMsg+"前超限；";
                    errMsg = errMsg + "前超限；";
                    back = true;
                }
                if (staProtocol.isBackErr()) {
                    errMsg = errMsg+"后超限";
                    errMsg = errMsg + "后超限";
                    back = true;
                }
                if (staProtocol.isHighErr()) {
                    errMsg = errMsg+"高超限";
                    errMsg = errMsg + "高超限";
                    back = true;
                }
                if (staProtocol.isLeftErr()) {
                    errMsg = errMsg+"左超限";
                    errMsg = errMsg + "左超限";
                    back = true;
                }
                if (staProtocol.isRightErr()) {
                    errMsg = errMsg+"右超限";
                    errMsg = errMsg + "右超限";
                    back = true;
                }
                if (staProtocol.isWeightErr()) {
                    errMsg = errMsg+"超重";
                    errMsg = errMsg + "超重";
                    back = true;
                }
                if (staProtocol.isBarcodeErr()) {
                    errMsg = errMsg+"扫码失败";
                    errMsg = errMsg + "扫码失败";
                    back = true;
                }
                // 退回
@@ -163,7 +162,7 @@
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                if (!Cools.isEmpty(barcode)&&!barcode.equals("00000000")) {
                if (!Cools.isEmpty(barcode) && !barcode.equals("00000000")) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;
@@ -181,7 +180,7 @@
                if (staProtocol.isAutoing() && staProtocol.isLoading()
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() >= 9992 && staProtocol.getWorkNo() <= 9999)
                        && staProtocol.isPakMk()){// && !Cools.isEmpty(barcode)) {
                        && staProtocol.isPakMk()) {// && !Cools.isEmpty(barcode)) {

//                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
@@ -211,7 +210,7 @@

                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                        locTypeDto.setLocType1((short)1);
                        locTypeDto.setLocType1((short) 1);
                        SearchLocParam param = new SearchLocParam();
                        param.setBarcode(barcode);
                        param.setIoType(1);
@@ -236,25 +235,25 @@
                                News.error("更新plc站点信息失败");
                                throw new CoolException("更新plc站点信息失败");
                            }
                        } else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))){
                        } else if (jsonObject.getInteger("code").equals(700) && (!barcodeThread.getBarcode().equals("NG"))) {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo((short)9991);
                            staProtocol.setWorkNo((short) 9991);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), true);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            News.error("url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        }else {
                            News.error("url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        } else {
                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                            barcodeThread.setBarcode("");
                            staProtocol.setWorkNo((short)9991);
                            staProtocol.setWorkNo((short) 9991);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), true);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                            News.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        }
                    } catch (Exception e) {
                        News.error("扫码入库报错，错误信息",e);
                        News.error("扫码入库报错，错误信息", e);
                        e.printStackTrace();
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    }
@@ -294,7 +293,9 @@
                        && staProtocol.isPakMk()) {
                    // 判断重复工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep11(inSta.getStaNo());
                    if (wrkMast == null) { continue; }
                    if (wrkMast == null) {
                        continue;
                    }

                    // 命令下发区 --------------------------------------------------------------------------

@@ -325,7 +326,7 @@
    /**
     * 拣料、并板、盘点再入库
     */
    public synchronized void stnToCrnStnPick(){
    public synchronized void stnToCrnStnPick() {
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历拣料入库口
            for (DevpSlave.Sta pickSta : devp.getPickSta()) {
@@ -335,9 +336,9 @@
                    continue;
                }
                String barcode = barcodeThread.getBarcode();
                if(!Cools.isEmpty(barcode)) {
                if (!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode)) {
                        continue;
                    }
                } else {
@@ -356,7 +357,7 @@
//                // 入出库模式判断
//                if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }

                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()){
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {

//                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
//                        log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
@@ -377,7 +378,7 @@
                        continue;
                    }
                    if ((wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107)
                        || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo()) ) {
                            || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
                        continue;
                    }

@@ -473,7 +474,7 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                if (staProtocol.isAutoing() && (staProtocol.isLoading()||staProtocol.getSiteId()==1000) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
                if (staProtocol.isAutoing() && (staProtocol.isLoading() || staProtocol.getSiteId() == 1000) && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
                    // 查询工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakOutStep2(staProtocol.getSiteId());
                    if (wrkMast == null) {
@@ -481,7 +482,7 @@
                    }
                    // 判断工作档条件
                    if (wrkMast.getIoType() < 100 || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
                        News.error("工作档案条件不满足：工作档案："+wrkMast+";条件iotype<100或者staNo为空或者sourceStaNo为空");
                        News.error("工作档案条件不满足：工作档案：" + wrkMast + ";条件iotype<100或者staNo为空或者sourceStaNo为空");
                        continue;
                    }
                    // 判断吊车是否实际已完成，且电脑状态在move中，以备电脑进行更新工作档
@@ -525,12 +526,14 @@
    /**
     * 入出库  ===>>  堆垛机入出库作业下发
     */
    public synchronized void crnIoExecute(){
    public synchronized void crnIoExecute() {
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) { continue; }
            if (crnProtocol == null) {
                continue;
            }
            BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
            if (basCrnp == null) {
                News.error("{}号堆垛机尚未在数据库进行维护！", crn.getId());
@@ -546,7 +549,7 @@
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
                    && crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
                // 库位移转
                this.stnToStn(crn, crnProtocol);
//                this.stnToStn(crn, crnProtocol);
                // 如果最近一次是入库模式
                if (crnProtocol.getLastIo().equals("I")) {
                    if (basCrnp.getInEnable().equals("Y")) {
@@ -578,7 +581,7 @@
    /**
     * 回原点，堆垛机没有执行中任务，设备存在入库任务时叫回原点
     */
    public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread){
    public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread) {
//        for (CrnSlave crn : slaveProperties.getCrn()) {
//            // 获取堆垛机信息
//            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
@@ -591,51 +594,51 @@
//                log.error("{}号堆垛机尚未在数据库进行维护！", crn.getId());
//                continue;
//            }
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
                if(crnProtocol.getBay() ==1 && crnProtocol.getLevel()==1){
                    return;
                }

                // 已经存在吊车执行任务时，则过滤3,12
                if (wrkMastMapper.selectWorking(crnProtocol.getCrnNo()) != null) {
                    return;
                }

                //堆垛机有执行中任务，过滤3,4,11,12
                if (wrkMastMapper.selectCrnWorking(crnProtocol.getCrnNo()) != null) {
                    return;
                }

                //输送线没有入库任务，过滤2
                if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
                    return;
                }

                log.info("堆垛机召回原点==>>" + crnProtocol.getCrnNo() + "号堆垛机有入库任务,召回原点");
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
                crnCommand.setTaskNo((short) 9999); // 工作号
                crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  回原点
                crnCommand.setSourcePosX((short) 0);     // 源库位排
                crnCommand.setSourcePosY((short) 0);     // 源库位列
                crnCommand.setSourcePosZ((short) 0);     // 源库位层
                crnCommand.setDestinationPosX((short) 0);     // 目标库位排
                crnCommand.setDestinationPosY((short) 0);     // 目标库位列
                crnCommand.setDestinationPosZ((short) 0);     // 目标库位层
                if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
                    log.error("堆垛机回原点命令下发失败，堆垛机号={}，任务数据={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
                }
                crnThread.setBackHpFlag(true);
        if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
            if (crnProtocol.getBay() == 1 && crnProtocol.getLevel() == 1) {
                return;
            }

            // 已经存在吊车执行任务时，则过滤3,12
            if (wrkMastMapper.selectWorking(crnProtocol.getCrnNo()) != null) {
                return;
            }

            //堆垛机有执行中任务，过滤3,4,11,12
            if (wrkMastMapper.selectCrnWorking(crnProtocol.getCrnNo()) != null) {
                return;
            }

            //输送线没有入库任务，过滤2
            if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) == null) {
                return;
            }

            log.info("堆垛机召回原点==>>" + crnProtocol.getCrnNo() + "号堆垛机有入库任务,召回原点");
            // 命令下发区 --------------------------------------------------------------------------
            CrnCommand crnCommand = new CrnCommand();
            crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
            crnCommand.setTaskNo((short) 9999); // 工作号
            crnCommand.setAckFinish((short) 0);  // 任务完成确认位
            crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  回原点
            crnCommand.setSourcePosX((short) 0);     // 源库位排
            crnCommand.setSourcePosY((short) 0);     // 源库位列
            crnCommand.setSourcePosZ((short) 0);     // 源库位层
            crnCommand.setDestinationPosX((short) 0);     // 目标库位排
            crnCommand.setDestinationPosY((short) 0);     // 目标库位列
            crnCommand.setDestinationPosZ((short) 0);     // 目标库位层
            if (!MessageQueue.offer(SlaveType.Crn, crnProtocol.getCrnNo(), new Task(2, crnCommand))) {
                log.error("堆垛机回原点命令下发失败，堆垛机号={}，任务数据={}", crnProtocol.getCrnNo(), JSON.toJSON(crnCommand));
            }
            crnThread.setBackHpFlag(true);
        }
//        }
    }

    /**
     * 入库  ===>>  堆垛机站到库位
     */
    public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol){
    public void crnStnToLoc(CrnSlave slave, CrnProtocol crnProtocol) {
        for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
            boolean flag = false;
            // 获取堆垛机入库站信息
@@ -653,7 +656,7 @@
                continue;
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                    && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
                flag = true;
            }
            if (!flag) {
@@ -661,7 +664,7 @@
            }
            // 获取工作状态为2（设备上走）的入库工作档
            WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
            if(null == wrkMast) {
            if (null == wrkMast) {
//                log.error("查询无待入库数据--wrk_sts=2, 工作号={}", staProtocol.getWorkNo());
                continue;
            }
@@ -716,9 +719,9 @@
//                        moveLocForDeepLocPakin(slave, shallowLoc, wrkMast);
                    }
                    continue;
                } else if (shallowLoc.getLocSts().equals("Q")){
                } else if (shallowLoc.getLocSts().equals("Q")) {
                    WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                    if (null != waitWrkMast && waitWrkMast.getWrkSts()==4) {
                    if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
                        continue;
                    }
                }
@@ -737,12 +740,12 @@
            crnCommand.setDestinationPosY(locMast.getBay1().shortValue());     // 目标库位列
            crnCommand.setDestinationPosZ(locMast.getLev1().shortValue());     // 目标库位层\
            crnCommand.setBarcode(wrkMast.getBarcode());//托盘码
            log.error("768 堆垛机命令下发"+crnCommand);
            log.error("768 堆垛机命令下发" + crnCommand);
            if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
            } else {
                log.error("772 堆垛机命令下发成功"+crnCommand);
                News.info("772 堆垛机命令下发成功"+crnCommand);
                log.error("772 堆垛机命令下发成功" + crnCommand);
                News.info("772 堆垛机命令下发成功" + crnCommand);

//                long startTime = System.currentTimeMillis();
//                while ((System.currentTimeMillis() - startTime) < COMMAND_TIMEOUT) {
@@ -757,8 +760,8 @@
//                }

                // 修改工作档状态 2.设备上走 => 3.吊车入库中
                log.error("787 修改工作档状态2.设备上走 => 3.吊车入库中 "+wrkMast);
                News.info("787 修改工作档状态2.设备上走 => 3.吊车入库中 "+wrkMast);
                log.error("787 修改工作档状态2.设备上走 => 3.吊车入库中 " + wrkMast);
                News.info("787 修改工作档状态2.设备上走 => 3.吊车入库中 " + wrkMast);
                Date now = new Date();
                wrkMast.setWrkSts(3L);
                wrkMast.setCrnStrTime(now);
@@ -766,8 +769,8 @@
                if (wrkMastMapper.updateById(wrkMast) == 0) {
                    News.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", wrkMast.getWrkNo());
                }
                log.error("795 修改工作档状态成功2.设备上走 => 3.吊车入库中"+wrkMast);
                News.info("795 修改工作档状态成功2.设备上走 => 3.吊车入库中"+wrkMast);
                log.error("795 修改工作档状态成功2.设备上走 => 3.吊车入库中" + wrkMast);
                News.info("795 修改工作档状态成功2.设备上走 => 3.吊车入库中" + wrkMast);
            }
        }
    }
@@ -776,23 +779,23 @@
     * 出库  ===>>  库位到堆垛机站
     * 2022-06-09 TQS修改，查询工作档LIST，遍历下发，防止第一个任务堵塞出库
     */
    public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol){
    public void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol) {
        for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
            // 获取工作状态为11（生成出库ID）的出库工作档
//            WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());
            List<WrkMast> wrkMasts = wrkMastMapper.selectPakOutStep11(slave.getId(), crnStn.getStaNo());
            for (WrkMast wrkMast : wrkMasts){
            for (WrkMast wrkMast : wrkMasts) {
                if (wrkMast == null) {
                    continue;
                }
                // 工作档状态判断
                if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null){
                if (wrkMast.getIoType() < 100 || wrkMast.getSourceStaNo() == null) {
                    News.error("查询工作档数据不符合条件--入出类型/站点, 工作号={}，源库位={}，入出类型={}", wrkMast.getWrkNo(), wrkMast.getSourceLocNo(), wrkMast.getIoType());
                    continue;
                }
                // 获取源库位信息
                LocMast sourceSta = locMastService.selectById(wrkMast.getSourceLocNo());
                if (!sourceSta.getLocSts().equals("R") &&!sourceSta.getLocSts().equals("P")) {
                if (!sourceSta.getLocSts().equals("R") && !sourceSta.getLocSts().equals("P")) {
                    News.error("出库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), sourceSta.getLocSts());
                    continue;
                }
@@ -817,20 +820,69 @@
//                    continue;
                }
                //查询在库信息
                LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_sts","R")
                        .eq("loc_no",wrkMast.getSourceLocNo()));
                if(Cools.isEmpty(locMast)){
                    News.error("出库 ===>> 库位中没有这笔资料",wrkMast.getSourceLocNo());
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                        .eq("loc_sts", "R")
                        .eq("loc_no", wrkMast.getSourceLocNo()));
                if (Cools.isEmpty(locMast)) {
                    News.error("出库 ===>> 库位中没有这笔资料", wrkMast.getSourceLocNo());
                    continue;
                }

                //消防报警出库
                if(wrkMast.getStaNo()==1000&& locMast.getCtnKind()==1){
                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                        && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                    //测试库位出库必须要按启动按钮才能出库
                    if ((wrkMast.getStaNo() == 206 || wrkMast.getStaNo() == 1000) && locMast.getCtnKind() == 0) {
                        News.error("出库 ===>> 等待启动出库按钮", wrkMast);
                        continue;
                    }
                    // 命令下发区 --------------------------------------------------------------------------

                    // 堆垛机控制过滤
                    if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                        continue;
                        break;
                    }

                    // 双深库位且浅库位有货，则需先对浅库位进行库位移转
                    if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
                        String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
                        LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                        // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用 直接搬！
                        if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                            if (null == waitWrkMast) {
                                News.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                            } else {
                                if (waitWrkMast.getWrkSts() == 11) {
                                    waitWrkMast.setIoPri(15D);
                                    waitWrkMast.setModiTime(new Date());
                                    if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                        News.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                                    }
                                    continue;
                                } else {

                                }
                            }
                        } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                            // 此标记避免多次执行移库任务
                            if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
                                    || Cools.isEmpty(waitWrkMast)) {
                                wrkMast.setUpdMk("Y");
                                wrkMastMapper.updateById(wrkMast);
                                // 生成工作档,将浅库位移转到新的库位中
                                moveLocForDeepLoc(slave, shallowLoc);
                            }
                            News.error("{}任务出库失败，浅库位堵塞！", wrkMast.getWrkNo());
                            continue;
                        } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
                            WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                            if (null != waitWrkMast && waitWrkMast.getWrkSts() == 4) {
                                continue;
                            }
                        }
                    }

                    // 已经存在吊车执行任务时，则过滤
@@ -865,99 +917,8 @@
                        }
                        break;
                    }
                }else {
                    // 判断堆垛机出库站状态
                    if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
                            && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                        //测试库位出库必须要按启动按钮才能出库
                        if((wrkMast.getStaNo()==206 || wrkMast.getStaNo()==1000)&& locMast.getCtnKind()==0){
                            News.error("出库 ===>> 等待启动出库按钮",wrkMast);
                            continue;
                        }
                        // 命令下发区 --------------------------------------------------------------------------

                        // 堆垛机控制过滤
                        if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                        continue;
                            break;
                        }

                        // 双深库位且浅库位有货，则需先对浅库位进行库位移转
                        if (Utils.isDeepLoc(slaveProperties, wrkMast.getSourceLocNo())) {
                            String shallowLocNo = Utils.getShallowLoc(slaveProperties, wrkMast.getSourceLocNo());
                            LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                            // O.空库位、Q.拣料/盘点/并板再入库、S.入库预约、X.禁用 直接搬！
                            if (shallowLoc.getLocSts().equals("P") || shallowLoc.getLocSts().equals("R")) {
                                WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                                if (null == waitWrkMast) {
                                    News.error("{}库位异常，未检索到相应工作档！", shallowLocNo);
                                } else {
                                    if(waitWrkMast.getWrkSts() == 11) {
                                        waitWrkMast.setIoPri(15D);
                                        waitWrkMast.setModiTime(new Date());
                                        if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                            News.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                                        }
                                        continue;
                                    } else {

                                    }
                                }
                            } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
                                WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                                // 此标记避免多次执行移库任务
                                if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
                                        || Cools.isEmpty(waitWrkMast)) {
                                    wrkMast.setUpdMk("Y");
                                    wrkMastMapper.updateById(wrkMast);
                                    // 生成工作档,将浅库位移转到新的库位中
                                    moveLocForDeepLoc(slave, shallowLoc);
                                }
                                News.error("{}任务出库失败，浅库位堵塞！", wrkMast.getWrkNo());
                                continue;
                            } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")){
                                WrkMast waitWrkMast = wrkMastMapper.selectByLocNo(shallowLocNo);
                                if (null != waitWrkMast && waitWrkMast.getWrkSts()==4) {
                                    continue;
                                }
                            }
                        }

                        // 已经存在吊车执行任务时，则过滤
                        if (wrkMastMapper.selectWorking(slave.getId()) != null) {
                            break;
//                        return;
                        }


                        // 1.堆垛机开始移动
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
                        crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 工作号
                        crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                        crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
                        crnCommand.setSourcePosX(sourceSta.getRow1().shortValue());     // 源库位排
                        crnCommand.setSourcePosY(sourceSta.getBay1().shortValue());     // 源库位列
                        crnCommand.setSourcePosZ(sourceSta.getLev1().shortValue());     // 源库位层
                        crnCommand.setDestinationPosX(crnStn.getRow().shortValue());     // 目标库位排
                        crnCommand.setDestinationPosY(crnStn.getBay().shortValue());     // 目标库位列
                        crnCommand.setDestinationPosZ(crnStn.getLev().shortValue());     // 目标库位层
                        crnCommand.setBarcode(wrkMast.getBarcode());
                        if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                            News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
                        } else {
                            // 修改工作档状态 11.生成出库ID => 12.吊车出库中
                            Date now = new Date();
                            wrkMast.setWrkSts(12L);
                            wrkMast.setCrnStrTime(now);
                            wrkMast.setModiTime(now);
                            if (wrkMastMapper.updateById(wrkMast) == 0) {
                                News.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast.getWrkNo());
                            }
                            break;
                        }
                    }
                }

            }
        }
    }
@@ -1082,36 +1043,36 @@
    /**
     * 库位移转
     */
    public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol){
    public void locToLoc(CrnSlave slave, CrnProtocol crnProtocol) {
//        log.info("开始移库任务程序");
        //获取所有移库任务
        List<WrkMast> wrkMasts=wrkMastMapper.selectLocMoves(slave.getId());
        List<WrkMast> wrkMasts = wrkMastMapper.selectLocMoves(slave.getId());
        // 获取工作档信息
        WrkMast wrkMast =null;
        if(Cools.isEmpty(wrkMasts)){
        WrkMast wrkMast = null;
        if (Cools.isEmpty(wrkMasts)) {
            return;
        }
        //先查测试库位转OK或者NG库位按了按钮的
        for (WrkMast wm: wrkMasts) {
            LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wm.getSourceLocNo()));
            if (!Cools.isEmpty(sourceSta1.getCtnKind())){
                if(sourceSta1.getCtnKind()==1){
                    wrkMast=wm;
        for (WrkMast wm : wrkMasts) {
            LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wm.getSourceLocNo()));
            if (!Cools.isEmpty(sourceSta1.getCtnKind())) {
                if (sourceSta1.getCtnKind() == 1) {
                    wrkMast = wm;
                    break;
                }
            }
        }
        //后查等待库位转测试库位
        if(Cools.isEmpty(wrkMast)){
            for (WrkMast wm: wrkMasts) {
                LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wm.getSourceLocNo()));
                if (sourceSta1.getLocType1()==3){
                        wrkMast=wm;
        if (Cools.isEmpty(wrkMast)) {
            for (WrkMast wm : wrkMasts) {
                LocMast sourceSta1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wm.getSourceLocNo()));
                if (sourceSta1.getLocType1() == 3) {
                    wrkMast = wm;
                }
            }
        }
        //都没有满足条件的，跳过移库
        if(Cools.isEmpty(wrkMast)){
        if (Cools.isEmpty(wrkMast)) {
            return;
        }

@@ -1148,8 +1109,8 @@
        }

        //测试库位出库必须要按启动按钮才能出库
        if(sourceSta.getLocType1()==1 && sourceSta.getCtnKind()==0){
            News.error("出库 ===>> 等待启动按钮",wrkMast);
        if (sourceSta.getLocType1() == 1 && sourceSta.getCtnKind() == 0) {
            News.error("出库 ===>> 等待启动按钮", wrkMast);
            return;
        }

@@ -1165,11 +1126,7 @@
        crnCommand.setDestinationPosX(sta.getRow1().shortValue());     // 目标库位排
        crnCommand.setDestinationPosY(sta.getBay1().shortValue());     // 目标库位列
        crnCommand.setDestinationPosZ(sta.getLev1().shortValue());     // 目标库位层
        if(!sta.getLocNo().equals("0102501")){
            crnCommand.setBarcode(wrkMast.getBarcode());//托盘码
        }else {
            crnCommand.setFireStaut((short) 1);
        }
        crnCommand.setBarcode(wrkMast.getBarcode());//托盘码
        if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
            News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
        } else {
@@ -1183,7 +1140,6 @@
            }
        }
        log.info("结束移库任务程序");

    }

    /**
@@ -1195,13 +1151,15 @@
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) { continue; }
            if (crnProtocol == null) {
                continue;
            }
            //  状态：等待确认 并且  任务完成位 = 1
            if (crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
                if(crnProtocol.getTaskNo()==9999){
                if (crnProtocol.getTaskNo() == 9999) {
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                }else {
                } else {
                    // 获取入库待确认工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep3(crnProtocol.getTaskNo().intValue());
                    if (wrkMast == null) {
@@ -1232,7 +1190,7 @@
     * 堆垛机异常信息记录
     */
    @Async
    public void recCrnErr(){
    public void recCrnErr() {
        Date now = new Date();
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
@@ -1254,7 +1212,7 @@
                                continue;
                            }
                            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                            String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
                            String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
                            BasErrLog basErrLog = new BasErrLog(
                                    null,    // 编号
                                    wrkMast.getWrkNo(),    // 工作号
@@ -1293,7 +1251,7 @@
                            }
                        }
                    }
                // 无任务
                    // 无任务
                } else {
                    BasErrLog latest = basErrLogService.findLatest(crn.getId());
                    // 有异常
@@ -1301,7 +1259,7 @@
                        // 记录新异常
                        if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
                            BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                            String errName = crnError==null? String.valueOf(crnProtocol.getAlarm()):crnError.getErrName();
                            String errName = crnError == null ? String.valueOf(crnProtocol.getAlarm()) : crnError.getErrName();
                            BasErrLog basErrLog = new BasErrLog(
                                    null,    // 编号
                                    null,    // 工作号
@@ -1316,7 +1274,7 @@
                                    null,    // 源站
                                    null,    // 源库位
                                    null,    // 条码
                                    (int)crnProtocol.getAlarm(),    // 异常码
                                    (int) crnProtocol.getAlarm(),    // 异常码
                                    errName,    // 异常
                                    1,    // 异常情况
                                    now,    // 添加时间
@@ -1329,7 +1287,7 @@
                                log.error("堆垛机plc异常记录失败 ===>> [id:{}] [error:{}]", crn.getId(), errName);
                            }
                        }
                    // 无异常
                        // 无异常
                    } else {
                        // 异常修复
                        if (latest != null && latest.getStatus() == 1) {
@@ -1354,7 +1312,7 @@
     * 空栈板初始化入库,叉车入库站放货
     */
    @Async
    public void storeEmptyPlt(){
    public void storeEmptyPlt() {
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历空板入库口
            for (DevpSlave.Sta emptyInSta : devp.getEmptyInSta()) {
@@ -1400,14 +1358,12 @@
                                throw new CoolException("更新plc站点信息失败");
                            }
                        } else {
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                            log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        }
                    } catch (Exception e) {
                        e.printStackTrace();
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    }




//                    // 检索库位
@@ -1492,7 +1448,9 @@
                }
                // 获取工作档数据
                WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
                if (null == wrkMast) { continue; }
                if (null == wrkMast) {
                    continue;
                }
                wrkMasts.add(wrkMast);
                // 组装命令
                LedCommand ledCommand = new LedCommand();
@@ -1542,19 +1500,19 @@
                            total = locDetl.getAnfme();
                        }
                        if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 1) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                        if (wrkMast.getIoType() == 103 && (null == wrkDetl.getInspect() || 0 == wrkDetl.getInspect())) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                        if (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 104) {
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(),total));
                            ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getBatch(), wrkDetl.getSpecs(), wrkDetl.getManu(), wrkDetl.getMemo(), wrkDetl.getAnfme(), total));
                        }
                    });
                }
                commands.add(ledCommand);
            }
            if(Cools.isEmpty(wrkMasts)){
            if (Cools.isEmpty(wrkMasts)) {
                continue;
            }
            Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
@@ -1660,7 +1618,7 @@
     * tip：同步
     */
    @Transactional
    public synchronized void moveLocForDeepLocPakin(CrnSlave crn, LocMast shallowLoc, WrkMast pakinWrkMast){
    public synchronized void moveLocForDeepLocPakin(CrnSlave crn, LocMast shallowLoc, WrkMast pakinWrkMast) {
        LocMast loc = locMastService.selectById(pakinWrkMast.getLocNo());

        // 获取工作号
@@ -1679,7 +1637,7 @@
        wrkMast.setFullPlt(shallowLoc.getFullPlt()); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D")?"Y":"N"); // 空板
        wrkMast.setEmptyMk(shallowLoc.getLocSts().equals("D") ? "Y" : "N"); // 空板
        wrkMast.setBarcode(shallowLoc.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setCtnNo("Y");  // 入库阻塞库位移转标记
@@ -1709,7 +1667,7 @@
        if (shallowLoc.getLocSts().equals("D") || shallowLoc.getLocSts().equals("F")) {
            shallowLoc.setLocSts("S"); // S.入库预约，入库阻塞库位移转
            shallowLoc.setModiTime(now);
            if (!locMastService.updateById(shallowLoc)){
            if (!locMastService.updateById(shallowLoc)) {
                throw new CoolException("更新源库位状态失败");
            }
        } else {
@@ -1735,7 +1693,7 @@
     * 因双深库位阻塞，对浅库位进行移转（立即执行版)
     * tip：同步
     */
    private void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc){
    private void moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc) {
        try {
            List<Integer> rows = locMastService.queryDistinctRow(crn.getId());
            LocMast loc = null;
@@ -1852,7 +1810,7 @@
    /**
     * 堆垛机演示  ===>> 库位移转
     */
    public synchronized void crnDemoOfLocMove1(){
    public synchronized void crnDemoOfLocMove1() {
        try {
            for (CrnSlave crn : slaveProperties.getCrn()) {
                if (!crn.getDemo()) {
@@ -1953,7 +1911,7 @@
    /**
     * 堆垛机命令下发后，异步修改工作档状态
     */
    public synchronized void crnIoWrkMast(){
    public synchronized void crnIoWrkMast() {
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
@@ -1966,7 +1924,9 @@
            if (crnProtocol.getStatusType() != CrnStatusType.IDLE && crnProtocol.getTaskNo() != 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
                // 获取工作档
                WrkMast wrkMast = wrkMastMapper.selectById(crnProtocol.getTaskNo());
                if (wrkMast == null) { continue; }
                if (wrkMast == null) {
                    continue;
                }
                // 入库
                if (wrkMast.getWrkSts() == 1 || wrkMast.getWrkSts() == 2) {
                    News.warn("堆垛机非空闲情况下，开始修改工作档状态。[id:{},时间：{}] >>>>> 堆垛机当前状态为：{}。任务号:{}", crn.getId(), DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), crnProtocol.getStatusType().desc, crnProtocol.getTaskNo());
@@ -1977,7 +1937,7 @@
                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                        News.error("修改工作档状态 2.设备上走 => 3.吊车入库中 失败！！，工作号={}", wrkMast.getWrkNo());
                    }
                    News.warn("修改工作档状态成功。[时间：{}] >>>>> 任务号:{}",  DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F),  wrkMast.getWrkNo());
                    News.warn("修改工作档状态成功。[时间：{}] >>>>> 任务号:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
                }
                // 出库、移库
                if (wrkMast.getWrkSts() == 11) {
@@ -1989,7 +1949,7 @@
                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                        News.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", wrkMast.getWrkNo());
                    }
                    News.warn("修改工作档状态成功。[时间：{}] >>>>> 任务号:{}",  DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F),  wrkMast.getWrkNo());
                    News.warn("修改工作档状态成功。[时间：{}] >>>>> 任务号:{}", DateUtils.convert(now, DateUtils.yyyyMMddHHmmsssss_F), wrkMast.getWrkNo());
                }


@@ -2047,9 +2007,11 @@
     * 站到站  ===>>  堆垛机109站到108站
     * 109防爆沙箱站点 出库 到 108站点
     */
    public void stnToStn(CrnSlave slave, CrnProtocol crnProtocol){
    public void stnToStn(CrnSlave slave, CrnProtocol crnProtocol) {
        for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
            if(crnStn.getStaNo()!=109){ continue; }
            if (crnStn.getStaNo() != 109) {
                continue;
            }

            boolean flag = false;
            // 获取堆垛机入库站信息
@@ -2067,7 +2029,7 @@
                continue;
            }
            if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                    && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
                    && staDetl.getCanining() != null && staDetl.getCanining().equals("Y")) {
                flag = true;
            }

@@ -2098,15 +2060,15 @@
            // 命令下发区 --------------------------------------------------------------------------
            CrnCommand crnCommand = new CrnCommand();
            crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
            crnCommand.setTaskNo((short)9999); // 工作号
            crnCommand.setTaskNo((short) 9999); // 工作号
            crnCommand.setAckFinish((short) 0);  // 任务完成确认位
            crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
            crnCommand.setSourcePosX(crnStn.getRow().shortValue());     // 源库位排
            crnCommand.setSourcePosY(crnStn.getBay().shortValue());     // 源库位列
            crnCommand.setSourcePosZ(crnStn.getLev().shortValue());     // 源库位层
            crnCommand.setDestinationPosX((short)2);     // 目标库位排
            crnCommand.setDestinationPosY((short)19);     // 目标库位列
            crnCommand.setDestinationPosZ((short)1);     // 目标库位层
            crnCommand.setDestinationPosX((short) 2);     // 目标库位排
            crnCommand.setDestinationPosY((short) 19);     // 目标库位列
            crnCommand.setDestinationPosZ((short) 1);     // 目标库位层
            if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(2, crnCommand))) {
                News.error("堆垛机命令下发失败，堆垛机号={}，任务数据={}", 1, JSON.toJSON(crnCommand));
            } else {
@@ -2123,12 +2085,12 @@
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                if(null != devpThread){
                    for (int i = 0; i < 48; i++){
                if (null != devpThread) {
                    for (int i = 0; i < 48; i++) {
                        int olsStatus = 0;//testMast表原来status数据状态
                        int newStatus = 0;//testMast表待修改的status数据状态
                        short newSingle = 0;  //PLC地址待修改的新值
                        switch (devpThread.startSignal[i][0]){//根据信号查找testMast表中对应状态条件,olsStatus，newStatus根据实际流程调整
                        switch (devpThread.startSignal[i][0]) {//根据信号查找testMast表中对应状态条件,olsStatus，newStatus根据实际流程调整
                            case 0://初始状态，入库
                                olsStatus = 1;//待测
                                newStatus = 1;//待测
@@ -2176,72 +2138,72 @@
                                newSingle = 0;//复位，寄存器地址，12===>>0
                                break;
                            default:
                                log.info("读取通道"+(i+1)+"测试库位按钮信号:为"+devpThread.startSignal[i][0]);
                                log.info("读取通道" + (i + 1) + "测试库位按钮信号:为" + devpThread.startSignal[i][0]);
                                continue;
                        }

                        TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                                .eq("channel",(i+1)).eq("status",olsStatus));//查找原来的状态
                        LocMast locMast=null;
                        boolean sign=false;
                        switch (devpThread.startSignal[i][0]){
                                .eq("channel", (i + 1)).eq("status", olsStatus));//查找原来的状态
                        LocMast locMast = null;
                        boolean sign = false;
                        switch (devpThread.startSignal[i][0]) {
                            case 0:
                                if (!Cools.isEmpty(testMast)){
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
                                        sign=true;
                                if (!Cools.isEmpty(testMast)) {
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")) {
                                        sign = true;
                                    }
                                }
                                break;
                            case 3:
                                if (!Cools.isEmpty(testMast)){
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
                                        sign=true;
                                        if (locMast.getPackStatus()==3){//测试完成
                                            newSingle=41;
                                        }else if (locMast.getPackStatus()==4){//测试失败
                                            newSingle=4;
                                        }else {
                                            log.info("读取通道"+(i+1)+"测试库位按钮信号:为"+devpThread.startSignal[i][0]+"通道库位pack状态信息异常"+locMast.getPackStatus());
                                            sign=false;
                                if (!Cools.isEmpty(testMast)) {
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")) {
                                        sign = true;
                                        if (locMast.getPackStatus() == 3) {//测试完成
                                            newSingle = 41;
                                        } else if (locMast.getPackStatus() == 4) {//测试失败
                                            newSingle = 4;
                                        } else {
                                            log.info("读取通道" + (i + 1) + "测试库位按钮信号:为" + devpThread.startSignal[i][0] + "通道库位pack状态信息异常" + locMast.getPackStatus());
                                            sign = false;
                                        }
                                    }
                                }
                                break;
                            case 5:
                            case 6:
                                if (!Cools.isEmpty(testMast)){
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
                                        if (devpThread.startSignal[i][0]==5 && locMast.getPackStatus()==4){
                                            sign=true;
                                        }else if (devpThread.startSignal[i][0]==6 && locMast.getPackStatus()==3){
                                            sign=true;
                                        }else {
                                            log.error("测试完成移库时按下完成按钮与测试结果不一致===>>[channel:{}", i+1);
                                if (!Cools.isEmpty(testMast)) {
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")) {
                                        if (devpThread.startSignal[i][0] == 5 && locMast.getPackStatus() == 4) {
                                            sign = true;
                                        } else if (devpThread.startSignal[i][0] == 6 && locMast.getPackStatus() == 3) {
                                            sign = true;
                                        } else {
                                            log.error("测试完成移库时按下完成按钮与测试结果不一致===>>[channel:{}", i + 1);
                                        }
                                    }else {
                                        log.error("测试完成移库时未查询到测试档案===>>[channel:{}", i+1);
                                    } else {
                                        log.error("测试完成移库时未查询到测试档案===>>[channel:{}", i + 1);
                                    }
                                }
                                break;
                            case 2:
                                if (!Cools.isEmpty(testMast)){
                                if (!Cools.isEmpty(testMast)) {
                                    testMast.setStatus(newStatus);
                                    testMast.setModiTime(new Date());
                                    if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
                                    if (!testMastService.update(testMast, new EntityWrapper<TestMast>().eq("channel", (i + 1)).eq("barcode", testMast.getBarcode()))) {
                                        throw new CoolException("更新产品测试状态失败");
                                    }else {
                                        sign=true;
                                    } else {
                                        sign = true;
                                    }
                                }else {
                                    log.error("启动测试时未查询到测试档案===>>[channel:{}", i+1);
                                } else {
                                    log.error("启动测试时未查询到测试档案===>>[channel:{}", i + 1);
                                }
                                break;
                            case 7:
                                SearchLocParam param = new SearchLocParam();
                                param.setBarcode(i+1+"");
                                param.setBarcode(i + 1 + "");
                                String response = new HttpHandler.Builder()
                                        .setUri(wmsUrl)
                                        .setPath("/mobile/test/suspend/auth")
@@ -2250,84 +2212,84 @@
                                        .doPost();
                                JSONObject jsonObject = JSON.parseObject(response);
                                if (jsonObject.getInteger("code").equals(200)) {
                                    testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("channel",(i+1)));
                                    testMast = testMastService.selectOne(new EntityWrapper<TestMast>().eq("channel", (i + 1)));
                                    testMast.setStatus(newStatus);
                                    testMast.setModiTime(new Date());
                                    if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
                                    if (!testMastService.update(testMast, new EntityWrapper<TestMast>().eq("channel", (i + 1)).eq("barcode", testMast.getBarcode()))) {
                                        log.error("更新产品测试状态失败");
                                    }
                                    sign=true;
                                    sign = true;
                                } else {
                                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl+"/mobile/test/suspend/auth", JSON.toJSONString(param), response);
                                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/mobile/test/suspend/auth", JSON.toJSONString(param), response);
                                }
                                break;
                            case 9:
                            case 12:
                                locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")){
                                locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
                                    locMast.setPackStatus(8); //8.紧急出库
                                    if (locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)))){
                                        log.info("库位：{}，紧急出库！",locMast.getLocNo());
                                    if (locMastService.update(locMast, new EntityWrapper<LocMast>().eq("channel", (i + 1)))) {
                                        log.info("库位：{}，紧急出库！", locMast.getLocNo());
                                    }
                                }else {
                                } else {
                                    log.error("库位不是在库状态，无需紧急出库！");
                                }
                                sign=true;
                                sign = true;
                                break;
                            case 10:
                                if (!Cools.isEmpty(testMast)){
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F") ){
                                        if ( locMast.getFireStatus().equals(1)){
                                            newSingle=11;
                                        }else {
                                if (!Cools.isEmpty(testMast)) {
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")) {
                                        if (locMast.getFireStatus().equals(1)) {
                                            newSingle = 11;
                                        } else {
                                            testMast.setStatus(newStatus);
                                            testMast.setModiTime(new Date());
                                            if(!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("channel",(i+1)).eq("barcode",testMast.getBarcode()))){
                                            if (!testMastService.update(testMast, new EntityWrapper<TestMast>().eq("channel", (i + 1)).eq("barcode", testMast.getBarcode()))) {
                                                throw new CoolException("更新产品测试状态失败");
                                            }else {
                                                sign=true;
                                            } else {
                                                sign = true;
                                            }
                                        }
                                    }
                                }
                                sign=true;
                                sign = true;
                                break;
                            case 13:
                                locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                if (locMast.getLocSts().equals("O")){
                                locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                if (locMast.getLocSts().equals("O")) {
                                    locMast.setLocSts("X");
                                    locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    locMastService.update(locMast, new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                }
                                sign=true;
                                sign = true;
                                break;
                            case 15:
                                locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                if (locMast.getLocSts().equals("X")){
                                locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                if (locMast.getLocSts().equals("X")) {
                                    locMast.setLocSts("O");
                                    locMastService.update(locMast,new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    locMastService.update(locMast, new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                                }
                                sign=true;
                                sign = true;
                                break;
                            default:
                                log.info("读取通道"+(i+1)+"测试库位按钮信号:为"+devpThread.startSignal[i][0]);
                                log.info("读取通道" + (i + 1) + "测试库位按钮信号:为" + devpThread.startSignal[i][0]);
                                continue;
                        }
                        if (sign){
                            boolean result = messageQueueOffer(i,newSingle,SlaveType.Devp, devp.getId());
                            if(!result){
                                log.error("更新测试信号失败===>>[channel:{},locNo:{},barcode:{}]", i+1, testMast.getLocNo(), testMast.getBarcode());
                        if (sign) {
                            boolean result = messageQueueOffer(i, newSingle, SlaveType.Devp, devp.getId());
                            if (!result) {
                                log.error("更新测试信号失败===>>[channel:{},locNo:{},barcode:{}]", i + 1, testMast.getLocNo(), testMast.getBarcode());
                            } else {
                                devpThread.startSignal[i][0]  = newSingle;
                                devpThread.startSignal[i][0] = newSingle;
                            }
                        }
                        try{
                            locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                            if(devpThread.startSignal[i][1]!=locMast.getFireStatus()){
                                messageQueueOffer2(i+1,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
                        try {
                            locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", (i + 1)));
                            if (devpThread.startSignal[i][1] != locMast.getFireStatus()) {
                                messageQueueOffer2(i + 1, (short) ((int) locMast.getFireStatus()), SlaveType.Devp, devp.getId());
                            }
                        }catch (Exception e){
                            log.error("火警  ===>> 给输送线发送警报失败,通道号：", i+1);
                        } catch (Exception e) {
                            log.error("火警  ===>> 给输送线发送警报失败,通道号：", i + 1);
                        }
                    }

@@ -2341,15 +2303,15 @@
        }
    }

    public boolean messageQueueOffer(int i ,short newSingle,SlaveType devp,Integer id){
    public boolean messageQueueOffer(int i, short newSingle, SlaveType devp, Integer id) {
        //复位PLC信号，借用输送站点实体类
        StaProtocol staProtocol = new StaProtocol();
        staProtocol.setSiteId(i*2);//寄存器地址
        staProtocol.setSiteId(i * 2);//寄存器地址
        staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,8==>0
        return MessageQueue.offer(devp, id, new Task(3, staProtocol));
    }

    public boolean messageQueueOffer2(int i ,short newSingle,SlaveType devp,Integer id){
    public boolean messageQueueOffer2(int i, short newSingle, SlaveType devp, Integer id) {
        //复位PLC信号，借用输送站点实体类
        StaProtocol staProtocol = new StaProtocol();
        staProtocol.setSiteId(i);//寄存器地址
@@ -2363,15 +2325,15 @@
    @Transactional
    public void fierCrn() {
        try {
            for (CrnSlave crn :slaveProperties.getCrn()) {
                if(crn.getId()!=1){
            for (CrnSlave crn : slaveProperties.getCrn()) {
                if (crn.getId() != 1) {
                    continue;
                }
                // 获取堆垛机信息
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("fire_status", 1));
                if (!Cools.isEmpty(locMast)){
                if (!Cools.isEmpty(locMast)) {
                    //报警信号写入1
                    if (!MessageQueue.offer(SlaveType.Crn, 1, new Task(4, 1))) {
                        News.error("火警  ===>> 给堆垛机发送报警信号失败");
@@ -2399,16 +2361,16 @@
        try {
            // 根据输送线plc遍历
            for (DevpSlave devp : slaveProperties.getDevp()) {
                BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",103));
                if (Cools.isEmpty(basDevp)){
                BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 103));
                if (Cools.isEmpty(basDevp)) {
                    News.error("103站点查询失败-MainServiceImpl.java-2255行");
                }
                if (basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()>0 && basDevp.getLoading().equals("Y") ){
                if (basDevp.getAutoing().equals("Y") && basDevp.getWrkNo() > 0 && basDevp.getLoading().equals("Y")) {
                    WrkDetl wrkDetl = wrkDetlService.devpPackNo(basDevp.getWrkNo());
                    if (Cools.isEmpty(wrkDetl)){
                    if (Cools.isEmpty(wrkDetl)) {
                        News.error("103站点查询失败-MainServiceImpl.java-2255行");
                    }
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4,wrkDetl.getMatnr()));
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, wrkDetl.getMatnr()));
                }
            }
        } catch (Exception e) {
@@ -2417,6 +2379,7 @@
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        }
    }

    /**
     * 根据PLC按钮测试、完成、暂停信号，更新testMast表中status值，交由WMS系统处理
     */
@@ -2427,18 +2390,18 @@
            for (DevpSlave devp : slaveProperties.getDevp()) {
                log.info("2363行程序开始运行");
                SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
                if(null != devpThread){
                    for (int i = 0; i < 48; i++){
                if (null != devpThread) {
                    for (int i = 0; i < 48; i++) {
//                        log.info("2367行程序开始运行，第"+i+"次");
                        boolean fig=false;
                        boolean fig = false;
                        //查询在库和预约出库
                        LocMast locMast=locMastService.selectztgx("F","R",i);
                        if(!Cools.isEmpty(locMast)){
                        LocMast locMast = locMastService.selectztgx("F", "R", i);
                        if (!Cools.isEmpty(locMast)) {
//                            log.info("2372行程序开始运行，查询测试档");
                            TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
                                    .eq("loc_no",locMast.getLocNo())
                                    .eq("user_id",locMast.getBarcode()));
                            if(Cools.isEmpty(testMast)){
                            TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                                    .eq("loc_no", locMast.getLocNo())
                                    .eq("user_id", locMast.getBarcode()));
                            if (Cools.isEmpty(testMast)) {
//                                log.info("2377行程序开始运行，测试档为空，跳过");
                                continue;
                            }
@@ -2451,82 +2414,82 @@

                            //testMast.setStatus
                            //"状态 0: 待申请  1: 申请中  2: 已复核 3:测试中 4:完成 5:移库 6:火警"
                            if(devpThread.startSignal[i][0]==8){
                                News.info("2390行程序开始运行，修改测试档状态为 1、申请中，开始修改前："+ JSON.toJSONString(testMast));
                            if (devpThread.startSignal[i][0] == 8) {
                                News.info("2390行程序开始运行，修改测试档状态为 1、申请中，开始修改前：" + JSON.toJSONString(testMast));
                                testMast.setStatus(1);
                                locMast.setPackStatus(1);
                                testMast.setModiTime(new Date());
                                log.info("2394行程序开始运行，修改测试档状态为 1、申请中,修改数据后、未更新"+JSON.toJSONString(testMast));
                            }else if(devpThread.startSignal[i][0]==2 && locMast.getPackStatus()!=2){
                                News.info("2396行程序开始运行，修改测试档状态为 3、测试中，开始修改前："+JSON.toJSONString(testMast));
                                log.info("2394行程序开始运行，修改测试档状态为 1、申请中,修改数据后、未更新" + JSON.toJSONString(testMast));
                            } else if (devpThread.startSignal[i][0] == 2 && locMast.getPackStatus() != 2) {
                                News.info("2396行程序开始运行，修改测试档状态为 3、测试中，开始修改前：" + JSON.toJSONString(testMast));
                                testMast.setStatus(3);
                                locMast.setPackStatus(2);
                                testMast.setModiTime(new Date());
                                log.info("2400，修改测试档状态为 3、测试中,修改数据后、未更新"+JSON.toJSONString(testMast));
                                log.info("2400，修改测试档状态为 3、测试中,修改数据后、未更新" + JSON.toJSONString(testMast));
                                //NG转OK需要还原源库位和目标库位状态，OK转NG 删除任务档
                                WrkMast wrkMast=wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                                        .eq("source_loc_no",locMast.getLocNo())
                                        .eq("wrk_sts",11));
                                News.info("2405，查询状态为生成出库id的测试完成（NG或OK）任务档，"+JSON.toJSONString(wrkMast));
                                if(!Cools.isEmpty(wrkMast)){
                                    if(wrkMast.getWrkSts()==11){
                                        if(wrkMast.getIoType()==11){
                                            log.info("2409，删除任务档为移库的，"+JSON.toJSONString(wrkMast));
                                            LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
                                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                                        .eq("source_loc_no", locMast.getLocNo())
                                        .eq("wrk_sts", 11));
                                News.info("2405，查询状态为生成出库id的测试完成（NG或OK）任务档，" + JSON.toJSONString(wrkMast));
                                if (!Cools.isEmpty(wrkMast)) {
                                    if (wrkMast.getWrkSts() == 11) {
                                        if (wrkMast.getIoType() == 11) {
                                            log.info("2409，删除任务档为移库的，" + JSON.toJSONString(wrkMast));
                                            LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
                                            locMast1.setLocSts("O");
                                            locMastService.update(locMast1,new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()));
                                            locMastService.update(locMast1, new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
                                        }
                                        wrkMastMapper.deleteById(wrkMast);
                                        log.info("2415，删除工作档"+JSON.toJSONString(wrkMast)+JSON.toJSONString(locMast));
                                        log.info("2415，删除工作档" + JSON.toJSONString(wrkMast) + JSON.toJSONString(locMast));
                                        locMast.setLocSts("F");
                                        log.info("2417，删除工作档"+JSON.toJSONString(wrkMast)+JSON.toJSONString(locMast));
                                        wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
                                        log.info("2419，删除工作明细"+wrkMast.getWrkNo());
                                        if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                                .eq("channel",i+1))){
                                            log.error("2422修改测试库位状态失败"+locMast.getLocNo()+JSON.toJSONString(locMast));
                                        }else{
                                            log.error("2424修改测试库位状态成功"+locMast.getLocNo()+JSON.toJSONString(locMast));
                                            fig=true;
                                        log.info("2417，删除工作档" + JSON.toJSONString(wrkMast) + JSON.toJSONString(locMast));
                                        wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                                        log.info("2419，删除工作明细" + wrkMast.getWrkNo());
                                        if (!locMastService.update(locMast, new EntityWrapper<LocMast>()
                                                .eq("channel", i + 1))) {
                                            log.error("2422修改测试库位状态失败" + locMast.getLocNo() + JSON.toJSONString(locMast));
                                        } else {
                                            log.error("2424修改测试库位状态成功" + locMast.getLocNo() + JSON.toJSONString(locMast));
                                            fig = true;
                                        }
                                    }
                                }
                            }else if(devpThread.startSignal[i][0]==3){
                            } else if (devpThread.startSignal[i][0] == 3) {
                                locMast.setPackStatus(7);
                                testMast.setModiTime(new Date());
                            }else if(devpThread.startSignal[i][0]==4 && testMast.getStatus()!=4&&locMast.getFireStatus()!=1&&testMast.getStatus()!=6){
                            } else if (devpThread.startSignal[i][0] == 4 && testMast.getStatus() != 4 && locMast.getFireStatus() != 1 && testMast.getStatus() != 6) {
                                locMast.setPackStatus(3);
                                testMast.setStatus(4);
                                testMast.setModiTime(new Date());
                                testMastService.insertPackQualified(true,new Date(),testMast.getBarcode());
                            }else if(devpThread.startSignal[i][0]==5 && testMast.getStatus()!=4&&locMast.getFireStatus()!=1&&testMast.getStatus()!=6){
                                testMastService.insertPackQualified(true, new Date(), testMast.getBarcode());
                            } else if (devpThread.startSignal[i][0] == 5 && testMast.getStatus() != 4 && locMast.getFireStatus() != 1 && testMast.getStatus() != 6) {
                                locMast.setPackStatus(4);
                                testMast.setStatus(4);
                                testMast.setModiTime(new Date());
                                testMastService.insertPackQualified(false,new Date(),testMast.getBarcode());
                                testMastService.insertPackQualified(false, new Date(), testMast.getBarcode());
                            }
//                            else if(devpThread.startSignal[i][0]==6||devpThread.startSignal[i][0]==7||devpThread.startSignal[i][0]==8){
//                                locMast.setPackStatus(devpThread.startSignal[i][0]+3);
//                            }
                            //通道启动按钮状态，1:可以启动出库或者移库，0:不能启动出库或者移库
                            locMast.setCtnKind(devpThread.startSignal[i][2]);
                            if(devpThread.startSignal[i][2]==1){
                                if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                        .eq("loc_sts","R")
                                        .eq("channel",i+1))){
                                    News.error("修改启动按钮状态，测试库位状态失败"+locMast.getLocNo(),locMast);
                            if (devpThread.startSignal[i][2] == 1) {
                                if (!locMastService.update(locMast, new EntityWrapper<LocMast>()
                                        .eq("loc_sts", "R")
                                        .eq("channel", i + 1))) {
                                    News.error("修改启动按钮状态，测试库位状态失败" + locMast.getLocNo(), locMast);
                                }
                            }else if(!locMast.getLocSts().equals("R")){
                                if(!fig){
                                    if(!locMastService.update(locMast,new EntityWrapper<LocMast>()
                                            .eq("loc_sts","F")
                                            .eq("channel",i+1))){
                                        News.error("修改测试库位状态失败"+locMast.getLocNo(),locMast);
                            } else if (!locMast.getLocSts().equals("R")) {
                                if (!fig) {
                                    if (!locMastService.update(locMast, new EntityWrapper<LocMast>()
                                            .eq("loc_sts", "F")
                                            .eq("channel", i + 1))) {
                                        News.error("修改测试库位状态失败" + locMast.getLocNo(), locMast);
                                    }
                                }
                                if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
                                        .eq("loc_no",locMast.getLocNo())
                                        .eq("user_id",locMast.getBarcode()))) {
                                if (!testMastService.update(testMast, new EntityWrapper<TestMast>()
                                        .eq("loc_no", locMast.getLocNo())
                                        .eq("user_id", locMast.getBarcode()))) {
                                    News.error("修改测试档状态失败" + locMast.getLocNo(), locMast);
                                }
                            }
@@ -2535,35 +2498,34 @@
                    //当充放电库位为O空库位时
                    //库位状态改为8空闲
                    //给PLC写消防信号
                    for (int i=0;i<48;i++){
                        LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",i+1));
                        TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
                                .eq("loc_no",locMast.getLocNo())
                                .eq("user_id",locMast.getBarcode()));
                        if((locMast.getLocSts().equals("O")||locMast.getLocSts().equals("S"))&&devpThread.startSignal[i][0]!=8){
                    for (int i = 0; i < 48; i++) {
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", i + 1));
                        TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                                .eq("loc_no", locMast.getLocNo())
                                .eq("user_id", locMast.getBarcode()));
                        if ((locMast.getLocSts().equals("O") || locMast.getLocSts().equals("S")) && devpThread.startSignal[i][0] != 8) {
                            Thread.sleep(1000);
                            MessageQueue.offer(SlaveType.Devp, 1, new Task(6,locMast.getChannel()-1));
                            MessageQueue.offer(SlaveType.Devp, 1, new Task(6, locMast.getChannel() - 1));
                        }
                        try{
                            if(locMast.getFireStatus()!=devpThread.startSignal[i][1]){
                                messageQueueOffer2(i,(short)((int)locMast.getFireStatus()),SlaveType.Devp, devp.getId());
                                if(Cools.isEmpty(testMast)){
                        try {
                            if (locMast.getFireStatus() != devpThread.startSignal[i][1]) {
                                messageQueueOffer2(i, (short) ((int) locMast.getFireStatus()), SlaveType.Devp, devp.getId());
                                if (Cools.isEmpty(testMast)) {
                                    continue;
                                }
                                if(locMast.getFireStatus()==1){
                                if (locMast.getFireStatus() == 1) {
                                    testMast.setStatus(6);//火警
                                    if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
                                            .eq("loc_no",locMast.getLocNo())
                                            .eq("user_id",locMast.getBarcode()))) {
                                    if (!testMastService.update(testMast, new EntityWrapper<TestMast>()
                                            .eq("loc_no", locMast.getLocNo())
                                            .eq("user_id", locMast.getBarcode()))) {
                                        News.error("修改测试档状态失败" + locMast.getLocNo(), locMast);
                                    }
                                }
                            }
                        }catch (Exception e){
                            News.error("火警  ===>> 给输送线发送警报失败,通道号：", i+1);
                        } catch (Exception e) {
                            News.error("火警  ===>> 给输送线发送警报失败,通道号：", i + 1);
                        }
                    }



                }

 src/main/java/com/zy/core/MainProcess.java

@@ -59,7 +59,7 @@
                    // 堆垛机异常信息记录
                    mainService.recCrnErr();
                    // 入库  ===>> 空栈板初始化入库,叉车入库站放货
                    mainService.storeEmptyPlt();
//                    mainService.storeEmptyPlt();
                    // 出库  ===>> 工作档信息写入led显示器
                    mainService.ledExecute();
                    // 其他  ===>> LED显示器复位，显示默认信息