#改造

cpT

2025-07-01 d0cd998f775255ad1ba89f5cd60ed3eb89e00404

#改造

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

@@ -668,6 +668,9 @@
            }

            CrnSlave crnSlave = new CrnSlave(crn);
            if (Cools.isEmpty(crnProtocol.getLoaded()) || crnProtocol.getLoaded()==0){
                continue;
            }

            if (!crn.getId().equals(crnProtocol.getLaneNo())) {
                for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -828,6 +831,9 @@
            }

            CrnSlave crn = new CrnSlave(crnSlave);
            if (Cools.isEmpty(crnProtocol.getLoaded()) || crnProtocol.getLoaded()==0){
                continue;
            }

            if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
                for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -984,7 +990,7 @@
                // 命令下发区 --------------------------------------------------------------------------
                CrnCommand crnCommand = new CrnCommand();
                crnCommand.setCrnNo(slave.getId()); // 堆垛机编号
                crnCommand.setCrnNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                crnCommand.setLaneNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 工作号
                crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 任务模式:  库位移转
@@ -1329,6 +1335,9 @@
                }

                CrnSlave crn = new CrnSlave(crnSlave);
                if (Cools.isEmpty(crnProtocol.getLoaded()) || crnProtocol.getLoaded()==0){
                    continue;
                }

                if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
                    for (CrnSlave crnOther : slaveProperties.getCrn()) {

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

@@ -206,6 +206,7 @@
                        }
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setAckFinish((short)1);
                        crnCommand.setLaneNo(crnProtocol.getLaneNo());
                        if (write(crnCommand)) {
                            resetFlag = false;
                        }

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

@@ -340,8 +340,11 @@
                BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                    barcodeThread.setBarcode(barcode);
                    if (!barcode.equals("000000")){
                        staProtocol.setBarcodeNow(barcode);
                    }
                }
                staProtocol.setBarcodeNow(barcode);

            }
        }