联调

dubin

2025-08-26 7cf48f71577796759277ff0b413823d6131c365e

联调

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

@@ -153,7 +153,7 @@
                    errMsg = "右超限";
                    back = true;
                }
                if (!back && staProtocol.getWeight() > 1000) {
                if (!back && staProtocol.getWeight() > 15000) {
                    errMsg = "超重或未读取";
                    back = true;
                }
@@ -1198,16 +1198,18 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                StaProtocol staProtocol1 = staProtocol.getSiteId()==101?devpThread.getStation().get(crnStn.getStaNo() + 1):devpThread.getStation().get(crnStn.getStaNo() - 1);
//                StaProtocol staProtocol1 = devpThread.getStation().get(crnStn.getStaNo() - 1);
                StaProtocol staProtocol1 = devpThread.getStation().get(crnStn.getStaNo() + 1);
//                StaProtocol staProtocol1 = devpThread.getStation().get(crnStn.getStaNo() + 1);
                if (staProtocol1 == null) {
                    News.infoNoLog("" + mark + " - 2" + " - 3" + " - 堆垛机出库站信息(staProtocol!=null继续执行,否则循环终止)：staProtocol=" + staProtocol);
                    break;
                } else {
                    staProtocol1 = staProtocol1.clone();
                }
                StaProtocol staProtocol2 = staProtocol.getSiteId()==101?devpThread.getStation().get(crnStn.getStaNo() + 2):devpThread.getStation().get(crnStn.getStaNo());
//                StaProtocol staProtocol2 = devpThread.getStation().get(crnStn.getStaNo() - 2);
                StaProtocol staProtocol2 = devpThread.getStation().get(crnStn.getStaNo() + 2);
//                StaProtocol staProtocol2 = devpThread.getStation().get(crnStn.getStaNo() + 2);
                if (staProtocol2 == null) {
                    News.infoNoLog("" + mark + " - 2" + " - 3" + " - 堆垛机出库站信息(staProtocol!=null继续执行,否则循环终止)：staProtocol=" + staProtocol);
                    break;
@@ -1215,7 +1217,7 @@
                    staProtocol2 = staProtocol2.clone();
                }
                //出入口输送线只允许存在一个托盘
                if(staProtocol.isLoading() || staProtocol1.isLoading() || staProtocol2.isLoading() ) {
                if(staProtocol.isLoading() || staProtocol1.isLoading() || staProtocol2.isLoading() || staProtocol.getWorkNo() != 0 || staProtocol1.getWorkNo() != 0 || staProtocol2.getWorkNo() != 0) {
                    break;
                }


 src/main/java/com/zy/core/MainProcess.java

@@ -86,7 +86,7 @@

                    if (i>10){
                        //空托盘自动出库
                       mainService.autoEmptyOut();
//                       mainService.autoEmptyOut();
                     //空托盘自动入库
//                       mainService.autoEmptyIn();
                        i=0;