*

lsh

2025-11-06 013c2ef0869f8599ac71444d256a70271bc5171d

 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,17 @@
                        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.setSignIntOut(true);
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        }
                    }
                }
@@ -2834,15 +2837,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.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");
                        }
                    }
                }