#

yxFwq

2025-01-01 c1d30e0e96f9fc0d32a9a5007977ce305e0d22c5

#

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

@@ -1135,7 +1135,7 @@

                    String barcode = wrkMast.getBarcode();
                    if(!Cools.isEmpty(barcode)) {
                        if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                        if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || "empty".equals(barcode)) {
                            continue;
                        }
                    } else {
@@ -4053,7 +4053,7 @@
                    String barcode = staProtocol.getBarcode();
                    if (!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {
                            continue;
                        }
                    } else {
@@ -8794,7 +8794,7 @@
            String barcode = staProtocol607.getBarcode();
            if (!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {
                if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {
                    return;
                }
            } else {
@@ -8804,9 +8804,13 @@
                    && staProtocol607.getStaNo() == 0 && staProtocol607.isInEnable()){
                WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
                if (!Cools.isEmpty(wrkMast)){
                    staProtocol607.setWorkNo(wrkMast.getWrkNo());
                    staProtocol607.setStaNo(staNo1);
                    boolean result2 = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocol607));

                    StaProtocol staProtocolNew = new StaProtocol();
                    staProtocolNew.setSiteId(staProtocol607.getSiteId());
                    staProtocolNew.setWorkNo(wrkMast.getWrkNo());
                    staProtocolNew.setStaNo(staNo1);
//                    devpThread.setPakMk(staProtocolNew.getSiteId(), false,7989);
                    boolean result = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocolNew));
                }
            }
        } else {
@@ -8824,38 +8828,34 @@

            }
        }

//        try{
//            for (int idi = 1;idi<5;idi++){
//                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, idi);
//
//                if (ledThread != null) {
//                    ErrMsg errMsg1 = new ErrMsg();
//                    errMsg1.setErrMsg("测试："+idi);
//                    errMsg1.setArea("1");
//                    MessageQueue.offer(SlaveType.Led, idi, new Task(5, errMsg1));
//                } try {
//                    Thread.sleep(500);
//                } catch (Exception e){
//
//                }
//            }
//            LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 3);
//
//            if (ledThread3 != null) {
//                ErrMsg errMsg1 = new ErrMsg();
//                errMsg1.setErrMsg("测试测试测试测试测试测试测试测试测试测试测试测试测试："+3);
//                errMsg1.setArea("1");
//                MessageQueue.offer(SlaveType.Led, 3, new Task(5, errMsg1));
//            } try {
//                Thread.sleep(500);
//            } catch (Exception e){
//
//            }
//        } catch (Exception e){ }


    }
    public synchronized void stackingCompletionDriveTray2() {
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
        StaProtocol staProtocol = devpThread.getStation().get(518);
        String barcode = staProtocol.getBarcode();
        if (!Cools.isEmpty(barcode)) {
            if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode) || !CodeDetectionUtil.barcodeDetection(barcode)) {
                return;
            }
        } else {
            return;
        }
        if (staProtocol.getWorkNo()==0 && staProtocol.isLoading() && staProtocol.isAutoing()
                && staProtocol.getStaNo() == 0 && staProtocol.isInEnable()){
            WrkMast wrkMast = wrkMastMapper.selectByBarcodeTwo(barcode);
            if (!Cools.isEmpty(wrkMast)){
                StaProtocol staProtocolNew = new StaProtocol();
                staProtocolNew.setSiteId(staProtocol.getSiteId());
                staProtocolNew.setWorkNo(wrkMast.getWrkNo());
                staProtocolNew.setStaNo(wrkMast.getStaNo());
                devpThread.setPakMk(staProtocolNew.getSiteId(), false,7989);
                boolean result = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocolNew));
            }
        }
    }



    public synchronized Integer jarGetStartStaNo(Integer staNo) {
        try {
            int[] jarNos=new int[]{3,1,4,2};//(607分配硫化罐)

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

@@ -105,6 +105,7 @@

                    /************************************JAR调度************************************/
                    mainService.stackingCompletionDriveTray();//分配硫化罐
                    mainService.stackingCompletionDriveTray2();//分配硫化罐

                    //Jar充电任务完成
                    mainService.jarChargeComplete();

 src/main/webapp/views/rgv.html

@@ -95,9 +95,9 @@
                        <th>小车目标位</th>
                        <th>小车当前位</th>
                        <th>任务号</th>
                        <th>状态1</th>
                        <th>状态2</th>
                        <th>状态3</th>
                        <th>无货空闲</th>
                        <th>取货到位</th>
                        <th>运行中</th>
                        <th>状态4</th>
                        <th>状态5</th>
                        <th>状态6</th>