cpT
2025-06-27 830527d30361c5d69065546562cc73d9afc4d0f7
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -129,7 +129,7 @@
                    boolean back = false;
                    String errMsg = "-";
                    if (staProtocol.getGrossWt()>=600){
                        errMsg = "超重";
                        errMsg = "超重:"+staProtocol.getGrossWt()+"kg";
                        back = true;
                    }
                    if (staProtocol.isFrontErr()) {
@@ -152,10 +152,10 @@
                        errMsg = "右超限";
                        back = true;
                    }
                    if (!back && staProtocol.isWeightErr()) {
                        errMsg = "超重";
                        back = true;
                    }
//                    if (!back && staProtocol.isWeightErr()) {
//                        errMsg = "超重";
//                        back = true;
//                    }
                    if (!back && staProtocol.isBarcodeErr()) {
                        errMsg = "扫码失败";
                        back = true;
@@ -384,10 +384,10 @@
                        errMsg = "右超限";
                        back = true;
                    }
                    if (!back && staProtocol.isWeightErr()) {
                        errMsg = "超重";
                        back = true;
                    }
//                    if (!back && staProtocol.isWeightErr()) {
//                        errMsg = "超重";
//                        back = true;
//                    }
                    // 退回
                    if (back) {
                        if (stano == inSta.getBackSta().shortValue()) {
@@ -1684,7 +1684,7 @@
                    boolean back = false;
                    String errMsg = "-";
                    if (staProtocol.getGrossWt()>=600){
                        errMsg = "超重";
                        errMsg = "超重:"+staProtocol.getGrossWt()+"kg";
                        back = true;
                    }
                    if (staProtocol.isFrontErr()) {
@@ -1707,10 +1707,10 @@
                        errMsg = "右超限";
                        back = true;
                    }
                    if (!back && staProtocol.isWeightErr()) {
                        errMsg = "超重";
                        back = true;
                    }
//                    if (!back && staProtocol.isWeightErr()) {
//                        errMsg = "超重";
//                        back = true;
//                    }
                    if (!back && staProtocol.isBarcodeErr()) {
                        errMsg = "扫码失败";
                        back = true;