#

TQS

2025-02-27 a8990be617f61ff8467c5b7cc6a0dfd1493607c5

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

@@ -272,9 +272,6 @@
                            }else if (inSta.getStaNo().equals(213)){
                                staProtocol.setWorkNo((short)9995);
                                staProtocol.setStaNo((short)214);
                            }else {
                                staProtocol.setWorkNo((short)9995);
                                staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            }
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
@@ -4950,9 +4947,25 @@
//                                    }
                                    }
                                } else {
                                    // 入库模式
                                    devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;

                                    CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 1);
                                    CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                                    if (crnProtocol != null) {
                                        if (crnProtocol.getTaskNo() != 0) {
                                            if (crnProtocol.isStatusEnd()){
                                                // 出库模式
                                                devpThread.ioModeOf3F = IoModeType.PAKOUT_MODE;
                                            }  else {
                                                // 入库模式
                                                devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
                                            }
                                        } else {
                                            // 入库模式
                                            devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
                                        }
                                    } else {
                                        // 入库模式
                                        devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
                                    }
                                }
                            }
                            break;
@@ -4979,8 +4992,25 @@
//                                    }
                                    }
                                } else {
                                    // 入库模式
                                    devpThread.ioModeOf4F = IoModeType.PAKIN_MODE;
                                    CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, 3);
                                    CrnProtocol crnProtocol = crnThread.getCrnProtocol();
                                    if (crnProtocol != null) {
                                        if (crnProtocol.getTaskNo() != 0) {
                                            if (crnProtocol.isStatusEnd()){
                                                // 出库模式
                                                devpThread.ioModeOf3F = IoModeType.PAKOUT_MODE;
                                            }  else {
                                                // 入库模式
                                                devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
                                            }
                                        } else {
                                            // 入库模式
                                            devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
                                        }
                                    } else {
                                        // 入库模式
                                        devpThread.ioModeOf3F = IoModeType.PAKIN_MODE;
                                    }
                                }
                            }
                            break;