*

L

3 天以前 7e68f81b38116bba40e70620c563168fcde66a37

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

@@ -116,7 +116,6 @@
    @Autowired
    private BasPlcerrorLogServiceImpl basPlcerrorLogService;
    public Long currentTimeMilliConnectCrnAuto= 0L;
    public int[] signIntOut= new int[]{0,0,0,0,0};

    public void generateStoreWrkFile() {
        try {
@@ -2820,13 +2819,18 @@
                        boolean crnStnToLocDemo = this.crnStnToLocDemo(crnSlave, crnProtocol);//  入库
                        if (crnStnToLocDemo){
                            crnProtocol.setLastIo("O");
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("O");
                        }
                    } else if (basCrnp.getOutEnable().equals("Y")) {
                        boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);//  出库
                        if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] >= crnProtocol.getLocMastDemoCount()){
                        if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        } else if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] < crnProtocol.getLocMastDemoCount()){
                            signIntOut[crnSlave.getId()-1] = signIntOut[crnSlave.getId()-1]+1;
                        } else if (locToCrnStnDemo){
                            crnProtocol.setLastIo("I");
                            crnProtocol.setSignIntOut(true);
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        }
                    }
                }
@@ -2834,14 +2838,19 @@
                else if (crnProtocol.getLastIo().equals("O")) {
                    if (basCrnp.getOutEnable().equals("Y")) {
                        boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);//  出库
                        if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] >= crnProtocol.getLocMastDemoCount()){
                        if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        } else if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] < crnProtocol.getLocMastDemoCount()){
                            signIntOut[crnSlave.getId()-1] = signIntOut[crnSlave.getId()-1]+1;
                        } 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.setLastIo("O");
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("O");
                        }
                    }
@@ -3069,6 +3078,8 @@
                                if (taskWrkMapper.updateById(taskWrk) == 0) {
                                    log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", taskWrk.getWrkNo());
                                }


                            } catch (Exception e) {
                                log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，工作号={}", taskWrk.getWrkNo());
                                log.error("修改工作档状态 11.生成出库ID => 12.吊车出库中 失败！！，异常：" + e);
@@ -3296,30 +3307,34 @@
                    if (Cools.isEmpty(basCrnp.getHpMk()) || !basCrnp.getHpMk().equals("Y")){
                        continue;
                    }
                    for (String locNo : crnProtocol.getLocMastDemoList()){
                        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);
                            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);
                    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);
                                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());
                            }
                        }
                    }