*

L

2 天以前 538ce7e95297953686db099cacd63e76d2d83154

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

@@ -2818,37 +2818,47 @@
                    if (basCrnp.getInEnable().equals("Y")) {
                        boolean crnStnToLocDemo = this.crnStnToLocDemo(crnSlave, crnProtocol);//  入库
                        if (crnStnToLocDemo){
                            crnProtocol.setSignIntOut(true);
                            crnProtocol.setLastIo("O");
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("O");
                        }
                    } else if (basCrnp.getOutEnable().equals("Y")) {
                        boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);//  出库
                        if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                        if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        } else if (locToCrnStnDemo){
                            crnProtocol.setLastIo("I");
                            crnProtocol.setSignIntOut(true);
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        } else {
                            boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);//  出库
                            if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                                crnProtocol.setLastIo("I");
                            } else if (locToCrnStnDemo){
                                crnProtocol.setLastIo("I");
                                crnProtocol.setSignIntOut(true);
                            } else if (!crnProtocol.isSignIntOut()){
                                crnProtocol.setLastIo("I");
                            }
                        }
                    }
                }
                // 如果最近一次是出库模式
                else if (crnProtocol.getLastIo().equals("O")) {
                    if (basCrnp.getOutEnable().equals("Y")) {
                        boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);//  出库
                        if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                        if (!crnProtocol.isSignIntOut()) {
                            crnProtocol.setLastIo("I");
                        } else if (locToCrnStnDemo){
                            crnProtocol.setLastIo("I");
                            crnProtocol.setSignIntOut(true);
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        } else {
                            boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);//  出库
                            if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                                crnProtocol.setLastIo("I");
                            } else if (locToCrnStnDemo){
                                crnProtocol.setLastIo("I");
                                crnProtocol.setSignIntOut(true);
                            } else if (!crnProtocol.isSignIntOut()){
                                crnProtocol.setLastIo("I");
                            }
                        }
                    } else if (basCrnp.getInEnable().equals("Y")) {
                        boolean crnStnToLocDemo = this.crnStnToLocDemo(crnSlave, crnProtocol);//  入库
                        if (crnStnToLocDemo){
                            crnProtocol.setSignIntOut(true);
                            crnProtocol.setLastIo("O");
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("O");
@@ -3307,33 +3317,58 @@
                    if (Cools.isEmpty(basCrnp.getHpMk()) || !basCrnp.getHpMk().equals("Y")){
                        continue;
                    }
                    boolean signIn = false;
                    for (String[] locS : crnProtocol.getLocMastDemoListSign()){
                        if (locS[3].equals(String.valueOf(locS.length))){
                            String locNo1 = locS[0];
                            String locNo2 = locS[2];
                            ArrayList<String> locNoList = new ArrayList<>();
                            locNoList.add(locNo1);
                            locNoList.add(locNo2);
                            for (String locNo : locNoList) {
                                TaskWrk taskWrk1 = taskWrkService.selectByTaskNo(locNo+"r");
                                if (Cools.isEmpty(taskWrk1)){
                                    continue;
                                }
                                signIn = true;
                                break;
                            }
                        }
                    }
                    if (signIn){
                        continue;
                    }
                    for (String[] locS : crnProtocol.getLocMastDemoListSign()){
                        if (locS[3].equals("1")){
                            String locNo = locS[0];
                            LocMast locMast = locMastService.selectByLocNo(locNo);
                            if (locMast.getLocSts().equals("F")){
                                CarryParam carryParam = new CarryParam();
                                carryParam.setTaskNo(locNo);
                                carryParam.setBarcode(locNo);
                                carryParam.setIoType(1);//任务类型=》1：出库、2：移库、3：入库   ====转换为====>  1：入库，2：出库，3：移库
                                carryParam.setTaskPriority(1);
                                carryParam.setTargetPoint("1012");
                                carryParam.setStartPoint(BarcodeUtils.formatCode(locNo));
                                carryParam.setMeno("Demo");
                                taskWrkController.addTaskPoint(carryParam);
                                Thread.sleep(50);
                            } else if (locMast.getLocSts().equals("O")){
                                CarryParam carryParam = new CarryParam();
                                carryParam.setTaskNo(locNo+"r");
                                carryParam.setBarcode(locNo);
                                carryParam.setIoType(3);//任务类型=》1：出库、2：移库、3：入库   ====转换为====>  1：入库，2：出库，3：移库
                                carryParam.setTaskPriority(1);
                                carryParam.setStartPoint("1012");
                                carryParam.setTargetPoint(BarcodeUtils.formatCode(locNo));
                                carryParam.setMeno("Demo");
                                taskWrkController.addTaskPoint(carryParam);
                                Thread.sleep(50);
                                LocFCSUtils.updateLocSInPlace(crnProtocol.getLocMastDemoListSign());
                            String locNo1 = locS[0];
                            String locNo2 = locS[2];
                            ArrayList<String> locNoList = new ArrayList<>();
                            locNoList.add(locNo1);
                            locNoList.add(locNo2);
                            for (String locNo : locNoList) {
                                LocMast locMast = locMastService.selectByLocNo(locNo);
                                if (locMast.getLocSts().equals("F")){
                                    CarryParam carryParam = new CarryParam();
                                    carryParam.setTaskNo(locNo);
                                    carryParam.setBarcode(locNo);
                                    carryParam.setIoType(1);//任务类型=》1：出库、2：移库、3：入库   ====转换为====>  1：入库，2：出库，3：移库
                                    carryParam.setTaskPriority(1);
                                    carryParam.setTargetPoint("1012");
                                    carryParam.setStartPoint(BarcodeUtils.formatCode(locNo));
                                    carryParam.setMeno("Demo");
                                    taskWrkController.addTaskPoint(carryParam);
                                } else if (locMast.getLocSts().equals("O")){
                                    CarryParam carryParam = new CarryParam();
                                    carryParam.setTaskNo(locNo+"r");
                                    carryParam.setBarcode(locNo);
                                    carryParam.setIoType(3);//任务类型=》1：出库、2：移库、3：入库   ====转换为====>  1：入库，2：出库，3：移库
                                    carryParam.setTaskPriority(1);
                                    carryParam.setStartPoint("1012");
                                    carryParam.setTargetPoint(BarcodeUtils.formatCode(locNo));
                                    carryParam.setMeno("Demo");
                                    taskWrkController.addTaskPoint(carryParam);
                                    LocFCSUtils.updateLocSInPlace(crnProtocol.getLocMastDemoListSign());
                                }
                            }
                        }
                    }