#

1

4 天以前 8af4d8f9621cee06aca1207a180eba1cff7a0922

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

@@ -1180,7 +1180,7 @@
            //mark - 3 - ....
            this.locToLoc(crn, crnProtocol,mark);
            //预调度
            this.crnRebackHp(crn, crnProtocol, crnThread);
//            this.crnRebackHp(crn, crnProtocol, crnThread);

        }
//        News.infoNoLog(""+mark+" - 0"+" - 堆垛机入出库作业下发执行完成");
@@ -1198,9 +1198,7 @@
                    new EntityWrapper<BasCrnp>().eq("crn_no", crnProtocol.getCrnNo())
            );
            boolean result = true;
            if(crnProtocol.getCrnNo() != 5 ){
                return;
            }

            for (CrnSlave.CrnStn crnStn : slave.getCrnInStn()) {
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, crnStn.getDevpPlcId());
                if(crnStn.getStaNo() == 4001){
@@ -1220,8 +1218,8 @@
            int x=1;
            switch (crnProtocol.getCrnNo()){
                case 1: x =2; break;
                case 2: x =6; break;
                case 3: x =11; break;
                case 2: x =7; break;
                case 3: x =10; break;
                case 4: x =14; break;
                case 5: x =18; break;
            }
@@ -1776,7 +1774,7 @@
                    break;
//                    continue;
                }
                if (staProtocol2.isLoading() && staProtocol2.isAutoing() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")) {
                if (staProtocol2.isLoading() && staProtocol2.isAutoing() && staProtocol2.getWorkNo() == 9997) {
                    // 堆垛机控制过滤
                    if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                        continue;
@@ -1817,7 +1815,7 @@
                        break;
                    }
                }
                if (staProtocol3.isLoading() && staProtocol3.isAutoing()) {
                if (staProtocol3.isLoading() && staProtocol3.isAutoing()&& staProtocol3.getWorkNo() == 9997) {
                    // 堆垛机控制过滤
                    if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
//                        continue;
@@ -5122,7 +5120,7 @@
                                        new EntityWrapper<BasArmMast>()
                                                .eq("status", 2)
                                                .eq("binding_tags", basArmMast.getBindingTags()));
                                if (binding_tags<2){
                                if (binding_tags==1){
                                    BasArmMast basArmMastOne = basArmMastService.selectOne(
                                            new EntityWrapper<BasArmMast>()
                                                    .eq("status", 2)
@@ -5133,6 +5131,25 @@
                                        continue;
                                    }

                                } else if (binding_tags == 0){
                                    boolean signBinding_tags_barcode = false;
                                    List<BasArmMast> binding_tags_barcodeList = basArmMastService.selectList(
                                            new EntityWrapper<BasArmMast>()
                                                    .eq("barcode", barcode));
                                    for (BasArmMast basArmMastBarcode : binding_tags_barcodeList){
                                        Integer selectCountAndBindingTags = basArmMastService.selectCountAndBindingTags(basArmMastBarcode.getArmNo(), basArmMastBarcode.getOrderNo(), basArmMastBarcode.getMatnr(),basArmMastBarcode.getBindingTags());
                                        Integer selectCountAndBindingTagsLog = basArmMastService.selectCountAndBindingTagsLog(basArmMastBarcode.getArmNo(),basArmMastBarcode.getOrderNo(), basArmMastBarcode.getMatnr(),basArmMastBarcode.getBindingTags());

                                        Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastBarcode.getOrderNo(), basArmMastBarcode.getMatnr(),basArmMastBarcode.getBindingTags());
                                        if ((selectCountAndBindingTags + selectCountAndBindingTagsLog) != anfmeSignOne.intValue()) {
//                                            signBinding_tags_barcode = true; /////
                                            break;
                                        }
                                    }
                                    if (signBinding_tags_barcode){
                                        armTaskAssignmentCallApiLogSave(staProtocol, "数据异常！！！", staProtocol.getSiteId()+"码垛位置，上一个分拣组未全部完成！！！", false);
                                        continue;
                                    }
                                }
                            }
//                            OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getMatnr());