#

lsh

2024-05-26 5989fd098fea045da7a3612d2c9b0da38b2d1d27

#

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

@@ -2099,7 +2099,7 @@
                continue;
            }
            if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
                log.error("入库操作库位状态不符合--状态, 库位号={}，库位状态={}", wrkMast.getLocNo(), locMast.getLocSts());
                log.error("入库操作库位状态不符合--状态, 库位号={}，库位状态={}", locMast.getLocNo(), locMast.getLocSts());
                continue;
            }

@@ -2893,6 +2893,9 @@
     */
    public synchronized void storeFinishedTwo() {
        for (CrnSlave crn : slaveProperties.getCrn()) {
            if (crn.getId()<3 || crn.getId()>5){
                continue;
            }
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -5495,4 +5498,11 @@
        }
    }

    /**
     * 入出库  ===>>  小车作业下发
     */
    public synchronized boolean steIoExecute(Integer sign) {
        return false;
    }

}

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

@@ -72,24 +72,31 @@
                    mainService.storeFinishedTwo();

                    /************************************RGV调度************************************/
//                    i++;
//                    k++;
//                    if (i<7) {
//                        // RGV  ===>>  小车任务作业下发
//                        try{
                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(7);  //7煜星特供，左右移动
//                            if (rgvIoExecuteSign){
//                                k = 0;
//                            } else if (k>7){
//                                k = 0;
//                                mainService.rgvRunWrkMastEmptyStaAvoidance();//避让
//                            }
//                        }catch (Exception e){
//                            log.error("RGV  ===>>  小车任务作业下发异常"+e);
//                        }
//                    }else {
//                        i = 0;
//                    }
                    i++;
                    k++;
                    if (i<8) {
                        // RGV  ===>>  小车任务作业下发
                        if (i == 7) {
                            try{
                                boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);  //7煜星特供，左右移动
//                                if (rgvIoExecuteSign){
//                                    k = 0;
//                                } else if (k>8){
//                                    k = 0;
//                                    mainService.rgvRunWrkMastEmptyStaAvoidance();//避让
//                                }
                            }catch (Exception e){
                                log.error("RGV  ===>>  小车任务作业下发异常"+e);
                            }
                        }else {
                            //穿梭板
//                            boolean rgvIoExecuteSign = mainService.rgvIoExecute(i);  //7煜星特供，左右移动

                        }

                    }else {
                        i = 0;
                    }
//                    //完成小车任务
                    mainService.rgvCompleteWrkMastSta();
                    /************************************RGV调度************************************/

 src/main/java/com/zy/core/thread/JarThread.java

@@ -123,9 +123,7 @@
                BasJarService service = SpringUtils.getBean(BasJarService.class);
                if (null != service) {
                    // 同步pakMk
                    BasJar one = service.selectById(slave.getId());

                    BasJar basJar = new BasJar();
                    BasJar basJar = service.selectById(slave.getId());
                    basJar.setJarNo(slave.getId());
                    if (!service.updateById(jarProtocol.toSqlModel(basJar))){
                        News.error("硫化罐plc数据库更新失败 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -307,6 +307,22 @@
            short commandFinish = 1;
            Thread.sleep(100L);
            result = siemensNet.Write("DB100.18", commandFinish);
            int signFinish = 1;
            while (signFinish<5){
                OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
                short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
                if (transInt16 != commandFinish){
                    log.info("下发DB100.18  回读失败" + "commandFinish:"+commandFinish);
                    log.info("下发DB100.18  回读失败" + "array:"+ JSON.toJSONString(array));
                    result = siemensNet.Write("DB100.18", commandFinish);
                    signFinish++;
                }else {
                    log.info("下发DB100.18" + "commandFinish:"+commandFinish);
                    log.info("下发DB100.18" + "array:"+ JSON.toJSONString(array));
                    break;
                }

            }
        }

        try {

 src/main/resources/application.yml

@@ -116,17 +116,17 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 153
      staNoOther: 152
      row: 4
      staNo: 261
      staNoOther: 261
      row: 10
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
      staNoOther: 101
      row: 1
      staNo: 200
      staNoOther: 200
      row: 9
      bay: 1
      lev: 1
  # 堆垛机4
@@ -142,17 +142,17 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 153
      staNoOther: 152
      row: 4
      staNo: 260
      staNoOther: 260
      row: 12
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
      staNoOther: 101
      row: 1
      staNo: 250
      staNoOther: 250
      row: 11
      bay: 1
      lev: 1
  # 堆垛机5
@@ -168,17 +168,17 @@
    # 堆垛机入库站点
    crnInStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 153
      staNoOther: 152
      row: 4
      staNo: 259
      staNoOther: 259
      row: 14
      bay: 1
      lev: 1
    # 堆垛机出库站点
    crnOutStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      staNo: 100
      staNoOther: 101
      row: 1
      staNo: 241
      staNoOther: 241
      row: 13
      bay: 1
      lev: 1
  # 堆垛机6
@@ -242,24 +242,24 @@
    slot: 0
    #RGV入库源站点
    rgvInSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 100
    rgvInSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 101
    #RGV出库源站点
    rgvOutSStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 110
    rgvOutSStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 112
    #RGV目标站点
    rgvDestStn[0]:
      devpPlcId: ${wcs-slave.devp[0].id}
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 102
    rgvDestStn[1]:
      devpPlcId: ${wcs-slave.devp[0].id}
      devpPlcId: ${wcs-slave.devp[1].id}
      staNo: 103

  # 输送线
@@ -286,13 +286,16 @@
      staNo: 173
    # 大料箱 双工位单伸 入库口1
    inLargeSta[0]:
      staNo: 153
      staNo: 292
    # 大料箱 双工位单伸 入库口1
    inLargeSta[1]:
      staNo: 145
      staNo: 281
    # 大料箱 双工位单伸 空板入库口1
    emptyInLargeSta[0]:
      staNo: 104
      staNo: 292
    # 大料箱 双工位单伸 空板入库口2
    emptyInLargeSta[1]:
      staNo: 281
  # 输送线
  devp[1]:
    id: 2
@@ -333,4 +336,44 @@
    ip: 192.168.18.5
    port: 5005
    devpPlcId: ${wcs-slave.devp[0].id}
    staArr: 144
    staArr: 144
  # JAR1
  jar[0]:
    id: 1
    ip: 10.10.10.100
    port: 120
  # JAR2
  jar[1]:
    id: 2
    ip: 10.10.10.100
    port: 120
  # JAR3
  jar[2]:
    id: 3
    ip: 10.10.10.100
    port: 120
  # JAR4
  jar[3]:
    id: 4
    ip: 10.10.10.100
    port: 120
  # ste1
  ste[0]:
    id: 1
    ip: 10.10.10.100
    port: 120
  # ste2
  ste[1]:
    id: 2
    ip: 10.10.10.100
    port: 120
  # ste3
  ste[2]:
    id: 3
    ip: 10.10.10.100
    port: 120
  # ste4
  ste[3]:
    id: 4
    ip: 10.10.10.100
    port: 120

 src/main/webapp/views/index.html

@@ -50,5 +50,54 @@

    // 系统运行状态
    var systemRunning = true;


    news();layx.min('wcs-news');
    function news() {
        layx.iframe(
            'wcs-news' // id
            , '系统分析报告'
            , "news.html"
            , {
                shadow:false
                , storeStatus:false
                // , skin: 'news'
                , width:800
                , height:600
                , position:'rb'
                // , control:false
                , opacity:0.9
                , border:false
                , icon:'<img src="../static/images/login.png" style="height:22px;display:block;"  alt=""/>'
                , stickMenu:true
                , maxMenu:false
                , closeMenu:false
                , moveLimit:{
                    leftOut: false,
                    rightOut: false,
                    topOut: false,
                    bottomOut: false,
                }
                , minWidth:300
                , minHeight:300
                , borderRadius: '8px'
                , shadeDestroy:true
                , escKey: false
                , event:{
                    onmin: {
                        after: function () {
                            $('.layx-min-statu').css("left", "inherit").css("right", "10px")
                        }
                    }
                    , onrestore:{
                        after: function () {
                            let win = layx.getFrameContext('wcs-news');
                            win.autoScroll = true
                        }
                    }
                }
            }
        );
    }
</script>
</html>