#

ytfl

2025-08-16 a8c86d21d112ede774d9fd0bae6ff228b8dd9918

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

@@ -233,6 +233,12 @@
                                    .eq("loc_no", dto.getLocNo()));

                            short staNo = dto.getStaNo().shortValue();

                            int sourceStaNo = dto.getSourceStaNo();
                            if (sourceStaNo == 1007) {
                                staNo = 2002;
                            }

                            if (inSta.getStaNo() == 1002) {
                                staNo = 2002;
                            }
@@ -1207,7 +1213,7 @@
//                    continue;
                }
                // 判断堆垛机出库站状态
                if (staProtocol.isAutoing()  && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
                if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {

                    //根据参数判断是否校验可出信号
                    String crnOutVerifyOut = "Y";
@@ -1219,10 +1225,6 @@

                    if (crnOutVerifyOut.equals("Y")) {
                        if (!staProtocol.isOutEnable()) {
                            continue;
                        }

                        if (staProtocol.isLoading()) {
                            continue;
                        }