1

zhang

2025-07-10 56e96066dd6595085703b25fe2dc317590fb06f2

1

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

@@ -124,7 +124,6 @@
                LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());



                String barcode = barcodeThread.getBarcode();
                if (!Cools.isEmpty(barcode)) {
                    News.info("" + mark + " - 1" + " - {}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
@@ -269,7 +268,7 @@
     * wms入库
     * 入库站，根据条码扫描生成入库工作档，工作状态 1 ==>> 2
     */
    public synchronized void generateStoreWrkFile0(Integer mark) {
    public synchronized void generateStoreWrkFile0(Integer mark) throws InterruptedException {
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            // 遍历入库口
@@ -283,8 +282,8 @@
                    staProtocol = staProtocol.clone();
                }

//                // 入出库模式判断
                if (inSta.getStaNo() == 203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) {
                //调用外形检测
                if (!shape(devp, staProtocol, devpThread, inSta)) {
                    continue;
                }

@@ -343,6 +342,7 @@
                if (barcodeThread == null) {
                    continue;
                }

                String barcode = barcodeThread.getBarcode();
                if (!Cools.isEmpty(barcode)) {
                    News.info("" + mark + " - 1" + " - {}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
@@ -378,15 +378,7 @@
                        continue;
                    }

                    // 拣、盘、并 作业站转换
//                    int stnNo = 0;
//                    if (wrkMast.getStaNo() == 109) {
//                        stnNo = 127;
//                    } else if (wrkMast.getStaNo() == 113) {
//                        stnNo = 128;
//                    } else {
//                        log.error("{}号任务数据异常！", wrkMast.getWrkNo());
//                    }

                    // 获取目标站
                    Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                            .eq("type_no", wrkMast.getIoType() - 50)
@@ -559,10 +551,6 @@
                continue;
            }

//            //堆垛机回原点任务中
//            if(crnThread.isBackHpFlag()){
//                continue;
//            }

            // 只有当堆垛机空闲 并且 无任务时才继续执行
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
@@ -594,8 +582,8 @@
            // 库位移转
            //mark - 3 - ....
            this.locToLoc(crn, crnProtocol, mark);
            this.locToLoc111(crn, crnProtocol, mark);
//            this.crnRebackHp(crnProtocol, crnThread);
            //this.locToLoc111(crn, crnProtocol, mark);
            this.crnRebackHp(crnProtocol, crnThread);

        }
        News.infoNoLog("" + mark + " - 0" + " - 堆垛机入出库作业下发执行完成");

 src/main/webapp/views/index.html

@@ -24,7 +24,7 @@
            <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">主控图</a></li>
            <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">输送设备</a></li>
            <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">堆垛机</a></li>
            <li><a id="devops" onclick="nav(this.id)" class="nav-unselect" href="#">运行诊断</a></li>
<!--            <li><a id="devops" onclick="nav(this.id)" class="nav-unselect" href="#">运行诊断</a></li>-->
        </ul>
    </div>
</div>