#fs

lsh

2024-09-09 9098f686cacede7a15f0534cdb3e4213d36aff73

#fs

 src/main/java/com/zy/asrs/controller/CrnController.java

File was deleted

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

Diff too large

 src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java

File was deleted

 src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java

File was deleted

 src/main/java/com/zy/asrs/task/StaEscalationScheduler.java

File was deleted

 src/main/java/com/zy/asrs/task/handler/JarBurialEscalationHandler.java

File was deleted

 src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java

File was deleted

 src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java

File was deleted

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

@@ -55,76 +55,6 @@
                        continue;
                    }

                    //初始化RGV地图
//                    mainService.initRgvMap();
                    //刷新RGV地图
//                    mainService.refreshRgvMap();
                    // 演示
//                    mainService.crnDemoOfLocMove1();
                    // 入出库模式切换函数
//                    mainService.ioConvert();
                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档

                    mainService.generateStoreWrkFile(); // 组托
                    mainService.generateStoreWrkFile464(); // 组托464
                    mainService.generateStoreWrkFileSingle(); // 组托  双工位单伸   小料箱
                    mainService.generateStoreWrkFileLarge(); // 组托  双工位单伸   大料箱
//                    mainService.generateStoreWrkFile0(); // WMS入库

                    // 出库  ===>>  堆垛机出库站到出库站
                    mainService.crnStnToOutStn();
                    // 出库  ===>>  堆垛机出库站到出库站  工位2
                    mainService.crnStnToOutStnTwo();
                    // 入出库  ===>>  堆垛机入出库作业下发
                    mainService.crnIoExecute();
                    // 入出库  ===>>  堆垛机入出库作业下发  双工位堆垛机
                    mainService.crnIoExecuteTwo();
                    // 入出库  ===>>  堆垛机入出库作业下发  双工位堆垛机  拆分执行任务下发
                    mainService.crnIoExecuteTwoExecute(i);//Execute
                    if (i%2==0){
                        // 入库  ===>> 执行对工作档的完成操作
                        mainService.storeFinished();
                    }else {
                        // 入库  ===>> 执行对工作档的完成操作  工位2
                        mainService.storeFinishedTwo();
                    }


//                    // 异常信息记录
//                    mainService.recErr();
                    // 入库  ===>> 空栈板初始化入库
                    mainService.storeEmptyPlt();
                    // 入库  ===>> 空栈板初始化入库  双工位单伸   小料箱
                    mainService.storeEmptyPltSingle();
                    // 入库  ===>> 空栈板初始化入库  双工位单伸   大料箱
                    mainService.storeEmptyPltLarge();
                    // 出库  ===>> 工作档信息写入led显示器
                    mainService.ledExecute();
                    // 其他   ===>> LED显示器复位，显示默认信息
                    mainService.ledReset();

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

                    //Jar充电任务完成
                    mainService.jarChargeComplete();
                    //JarWrkMastExecute任务完成
                    mainService.jarWrkMastExecuteGenerateComplete(k);
                    //JarWrkMastExecute任务创建   //硫化罐
                    mainService.jarWrkMastExecuteGenerate(k);
                    //JarWrkMastExecute任务执行
                    mainService.jarWrkMastExecuteAction(k,j);
                    //Jar任务创建
                    mainService.jarMastGenerate();
                    //Jar任务完成
                    mainService.jarMastGenerateComplete();
                    //Jar充电任务创建
                    mainService.jarChargeGenerate();





                    /************************************JAR调度************************************/



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

@@ -53,10 +53,10 @@
    }

    private void initMq(){
        // 初始化堆垛机mq
        for (Slave crn : slaveProperties.getCrn()) {
            MessageQueue.init(SlaveType.Crn, crn);
        }
//        // 初始化堆垛机mq
//        for (Slave crn : slaveProperties.getCrn()) {
//            MessageQueue.init(SlaveType.Crn, crn);
//        }
//        // 初始化RGVmq
//        for (Slave rgv : slaveProperties.getRgv()) {
//            MessageQueue.init(SlaveType.Rgv, rgv);
@@ -65,42 +65,42 @@
        for (Slave devp : slaveProperties.getDevp()) {
            MessageQueue.init(SlaveType.Devp, devp);
        }
        // 初始化条码扫描仪mq
        for (Slave barcode : slaveProperties.getBarcode()) {
            MessageQueue.init(SlaveType.Barcode, barcode);
        }
        // 初始化Led灯mq
        for (Slave led : slaveProperties.getLed()) {
            MessageQueue.init(SlaveType.Led, led);
        }
        // 初始化磅称mq
        for (Slave scale : slaveProperties.getScale()) {
            MessageQueue.init(SlaveType.Scale, scale);
        }
        // 初始化硫化罐mq
        for (Slave jar : slaveProperties.getJar()) {
            MessageQueue.init(SlaveType.Jar, jar);
        }
//        // 初始化条码扫描仪mq
//        for (Slave barcode : slaveProperties.getBarcode()) {
//            MessageQueue.init(SlaveType.Barcode, barcode);
//        }
//        // 初始化Led灯mq
//        for (Slave led : slaveProperties.getLed()) {
//            MessageQueue.init(SlaveType.Led, led);
//        }
//        // 初始化磅称mq
//        for (Slave scale : slaveProperties.getScale()) {
//            MessageQueue.init(SlaveType.Scale, scale);
//        }
//        // 初始化硫化罐mq
//        for (Slave jar : slaveProperties.getJar()) {
//            MessageQueue.init(SlaveType.Jar, jar);
//        }
//        // 初始化台车mq
//        for (Slave car : slaveProperties.getCar()) {
//            MessageQueue.init(SlaveType.Car, car);
//        }
        // 初始化Stemq
        for (Slave ste : slaveProperties.getSte()) {
            MessageQueue.init(SlaveType.Ste, ste);
        }
//        // 初始化Stemq
//        for (Slave ste : slaveProperties.getSte()) {
//            MessageQueue.init(SlaveType.Ste, ste);
//        }
    }

    private void initThread(){
        // 初始化堆垛机线程
        log.info("初始化堆垛机线程...................................................");
        for (CrnSlave crn : slaveProperties.getCrn()) {
            CrnThread crnThread = new SiemensCrnThread(crn);
            Thread thread = new Thread((Runnable) crnThread);
            thread.start();
            map.put(crnThread, thread);
            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
        }
//        // 初始化堆垛机线程
//        log.info("初始化堆垛机线程...................................................");
//        for (CrnSlave crn : slaveProperties.getCrn()) {
//            CrnThread crnThread = new SiemensCrnThread(crn);
//            Thread thread = new Thread((Runnable) crnThread);
//            thread.start();
//            map.put(crnThread, thread);
//            SlaveConnection.put(SlaveType.Crn, crn.getId(), crnThread);
//        }
//        // 初始化穿梭车线程
//        log.info("初始化RGV线程...................................................");
//        for (RgvSlave rgv : slaveProperties.getRgv()) {
@@ -108,49 +108,49 @@
//            new Thread((Runnable) rgvThread).start();
//            SlaveConnection.put(SlaveType.Rgv, rgv.getId(), rgvThread);
//        }
        // 初始化输送线线程
        log.info("初始化输送线线程...................................................");
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = new SiemensDevpThread(devp);
            new Thread((Runnable) devpThread).start();
            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
        }

        // 初始化条码扫描仪线程
        log.info("初始化条码扫描仪线程...................................................");
        for (Slave barcode : slaveProperties.getBarcode()) {
            BarcodeThread barcodeThread = new BarcodeThread(barcode);
//        // 初始化输送线线程
//        log.info("初始化输送线线程...................................................");
//        for (DevpSlave devp : slaveProperties.getDevp()) {
//            DevpThread devpThread = new SiemensDevpThread(devp);
//            new Thread((Runnable) devpThread).start();
//            SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
//        }
//
//        // 初始化条码扫描仪线程
//        log.info("初始化条码扫描仪线程...................................................");
//        for (Slave barcode : slaveProperties.getBarcode()) {
//            BarcodeThread barcodeThread = new BarcodeThread(barcode);
////            new Thread(barcodeThread).start();
//            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
//        }
//        // 初始化LED线程
//        log.info("初始化LED线程...................................................");
//        for (LedSlave led : slaveProperties.getLed()) {
//            LedThread ledThread = new LedThread(led);
//            new Thread(ledThread).start();
//            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
//        }
//        // 初始化jar线程
//        log.info("初始化jar线程...................................................");
//        for (JarSlave jar : slaveProperties.getJar()) {
//            JarThread jarThread = new JarThread(jar);
//            new Thread(jarThread).start();
//            SlaveConnection.put(SlaveType.Jar, jar.getId(), jarThread);
//        }
//        // 初始化Ste线程
//        log.info("初始化ste线程...................................................");
//        for (SteSlave ste : slaveProperties.getSte()) {
//            SteThread steThread = new SteThread(ste);
//            new Thread(steThread).start();
//            SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
//        }
//        // 初始化磅秤线程
//        log.info("初始化磅秤线程...................................................");
//        for (Slave scale : slaveProperties.getScale()) {
//            ScaleThread barcodeThread = new ScaleThread(scale);
//            new Thread(barcodeThread).start();
            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
        }
        // 初始化LED线程
        log.info("初始化LED线程...................................................");
        for (LedSlave led : slaveProperties.getLed()) {
            LedThread ledThread = new LedThread(led);
            new Thread(ledThread).start();
            SlaveConnection.put(SlaveType.Led, led.getId(), ledThread);
        }
        // 初始化jar线程
        log.info("初始化jar线程...................................................");
        for (JarSlave jar : slaveProperties.getJar()) {
            JarThread jarThread = new JarThread(jar);
            new Thread(jarThread).start();
            SlaveConnection.put(SlaveType.Jar, jar.getId(), jarThread);
        }
        // 初始化Ste线程
        log.info("初始化ste线程...................................................");
        for (SteSlave ste : slaveProperties.getSte()) {
            SteThread steThread = new SteThread(ste);
            new Thread(steThread).start();
            SlaveConnection.put(SlaveType.Ste, ste.getId(), steThread);
        }
        // 初始化磅秤线程
        log.info("初始化磅秤线程...................................................");
        for (Slave scale : slaveProperties.getScale()) {
            ScaleThread barcodeThread = new ScaleThread(scale);
            new Thread(barcodeThread).start();
            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
        }
//            SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
//        }
    }


@@ -161,7 +161,7 @@
    @Component
    class killThread {

        @Scheduled(cron = "0/3 * * * * ? ")
       /* @Scheduled(cron = "0/3 * * * * ? ")
        public void kill() {
            for (Map.Entry<CrnThread, Thread> entry : map.entrySet()) {
                CRN_COUNT++;
@@ -193,7 +193,7 @@
                    map.put(entry.getKey(), thread);
                }
            }
        }
        }*/

    }


 src/main/resources/application.yml

@@ -8,8 +8,8 @@
    name: @pom.build.finalName@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://10.10.10.201:1433;databasename=ahyxasrs
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
#    url: jdbc:sqlserver://10.10.10.201:1433;databasename=ahyxasrs
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=ahyxasrs
    username: sa
    password: sa@123
  mvc: