cpT
2025-07-01 be822b9065892ab857580faea950d8cb377d2280
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -137,31 +137,55 @@
                        back = true;
                    }
                    if (staProtocol.isFrontErr()) {
                        if (!back){
                        errMsg = "前超限";
                        } else {
                            errMsg = errMsg+"---"+"前超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isBackErr()) {
                    if (staProtocol.isBackErr()) {
                        if (!back){
                        errMsg = "后超限";
                        } else {
                            errMsg = errMsg+"---"+"后超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isHighErr()) {
                    if (staProtocol.isHighErr()) {
                        if (!back){
                        errMsg = "高超限";
                        } else {
                            errMsg = errMsg+"---"+"高超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isLeftErr()) {
                    if (staProtocol.isLeftErr()) {
                        if (!back){
                        errMsg = "左超限";
                        } else {
                            errMsg = errMsg+"---"+"左超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isRightErr()) {
                    if (staProtocol.isRightErr()) {
                        if (!back){
                        errMsg = "右超限";
                        } else {
                            errMsg = errMsg+"---"+"右超限";
                        }
                        back = true;
                    }
//                    if (!back && staProtocol.isWeightErr()) {
//                        errMsg = "超重";
//                        back = true;
//                    }
                    if (!back && staProtocol.isBarcodeErr()) {
                    if (staProtocol.isBarcodeErr()) {
                        if (!back){
                        errMsg = "扫码失败";
                        } else {
                            errMsg = errMsg+"---"+"扫码失败";
                        }
                        back = true;
                    }
                    // 退回
@@ -1867,31 +1891,55 @@
                        back = true;
                    }
                    if (staProtocol.isFrontErr()) {
                        if (!back){
                        errMsg = "前超限";
                        } else {
                            errMsg = errMsg+"---"+"前超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isBackErr()) {
                    if (staProtocol.isBackErr()) {
                        if (!back){
                        errMsg = "后超限";
                        } else {
                            errMsg = errMsg+"---"+"后超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isHighErr()) {
                    if (staProtocol.isHighErr()) {
                        if (!back){
                        errMsg = "高超限";
                        } else {
                            errMsg = errMsg+"---"+"高超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isLeftErr()) {
                    if (staProtocol.isLeftErr()) {
                        if (!back){
                        errMsg = "左超限";
                        } else {
                            errMsg = errMsg+"---"+"左超限";
                        }
                        back = true;
                    }
                    if (!back && staProtocol.isRightErr()) {
                    if (staProtocol.isRightErr()) {
                        if (!back){
                        errMsg = "右超限";
                        } else {
                            errMsg = errMsg+"---"+"右超限";
                        }
                        back = true;
                    }
//                    if (!back && staProtocol.isWeightErr()) {
//                        errMsg = "超重";
//                        back = true;
//                    }
                    if (!back && staProtocol.isBarcodeErr()) {
                    if (staProtocol.isBarcodeErr()) {
                        if (!back){
                        errMsg = "扫码失败";
                        } else {
                            errMsg = errMsg+"---"+"扫码失败";
                        }
                        back = true;
                    }
                    // 退回