#改造

cpT

2025-07-01 52a57d1a6cd61009304656db35e50d4b9dbbda03

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

@@ -668,7 +668,7 @@
            }

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

@@ -778,7 +778,7 @@
                        // 命令下发区 --------------------------------------------------------------------------
                        CrnCommand crnCommand = new CrnCommand();
                        crnCommand.setCrnNo(crnProtocol.getCrnNo()); // 堆垛机编号
                        crnCommand.setCrnNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                        crnCommand.setLaneNo(crnProtocol.getLaneNo()); // 堆垛机巷道编号
                        crnCommand.setTaskNo((short)999); // 工作号
                        crnCommand.setAckFinish((short) 0);  // 任务完成确认位
                        crnCommand.setTaskMode(CrnTaskModeType.GO_ORIGIN); // 任务模式:  库位移转
@@ -831,7 +831,7 @@
            }

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

@@ -1335,7 +1335,7 @@
                }

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

@@ -1357,11 +1357,14 @@
                    }
//                Thread.sleep(300);
                    //确认完成信号
                    CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
                    crnOperatorParam.setCrnNo(crn.getId());
//                    CrnOperatorParam crnOperatorParam = new CrnOperatorParam();
//                    crnOperatorParam.setCrnNo(crn.getId());
                    Date now = new Date();

                    crnController.crnTaskComplete(crnOperatorParam);
//                    crnController.crnTaskComplete(crnOperatorParam);
//                    MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))
                    crnThread.setResetFlag(true);

                    if (!Cools.isEmpty(taskWrk)) {
                        if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
                            taskWrk.setWrkSts(4);//入库完成