*

lsh

2025-11-06 013c2ef0869f8599ac71444d256a70271bc5171d

*

 src/main/java/com/zy/asrs/controller/BasCrnpController.java

@@ -205,6 +205,7 @@
            crnProtocol.setLocMastDemoList(locMastDemoList);
            crnProtocol.setStaOutDemo(basCrnpParam.getStaOutDemo());
            crnProtocol.setStaIntDemo(basCrnpParam.getStaIntDemo());
            crnProtocol.setSignIntOut(false);
        }
        basCrnp.setHpMk(basCrnpParam.getHpMk());
        basCrnp.setModiUser(getUserId());

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

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

    public void generateStoreWrkFile() {
        try {
@@ -2820,16 +2819,16 @@
                        boolean crnStnToLocDemo = this.crnStnToLocDemo(crnSlave, crnProtocol);//  入库
                        if (crnStnToLocDemo){
                            crnProtocol.setLastIo("O");
                        } else if (!signIntOut[crnSlave.getId()-1]){
                        } 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]){
                        if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        } else if (locToCrnStnDemo && !signIntOut[crnSlave.getId()-1]){
                            signIntOut[crnSlave.getId()-1] = true;
                        } else if (!signIntOut[crnSlave.getId()-1]){
                        } else if (locToCrnStnDemo){
                            crnProtocol.setSignIntOut(true);
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        }
                    }
@@ -2838,18 +2837,18 @@
                else if (crnProtocol.getLastIo().equals("O")) {
                    if (basCrnp.getOutEnable().equals("Y")) {
                        boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);//  出库
                        if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1]){
                        if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("I");
                        } else if (locToCrnStnDemo && !signIntOut[crnSlave.getId()-1]){
                            signIntOut[crnSlave.getId()-1] = true;
                        } else if (!signIntOut[crnSlave.getId()-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 (!signIntOut[crnSlave.getId()-1]){
                        } else if (!crnProtocol.isSignIntOut()){
                            crnProtocol.setLastIo("O");
                        }
                    }

 src/main/java/com/zy/core/model/protocol/CrnProtocol.java

@@ -208,6 +208,7 @@
    public ArrayList<String> locMastDemoList;//测试库位列表
    public Integer staOutDemo;//测试库位出库站
    public Integer staIntDemo;//测试库位入库站
    public boolean signIntOut;//测试库位入库站

    public void setMode(Short mode) {
        this.mode = mode;