1

zhang

2 天以前 88fdf1ab75fd6cddfbc032a7e05ae9fe4639a361

 zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/FakeUserOperationHandler.java

@@ -55,12 +55,12 @@
                return;
            }
            StaProtocol staProtocol5 = devpThread.getStation().get(1005);
            if (staProtocol5.isLoading()){
            if (staProtocol5.isLoading()) {
                log.info("1005有物，等无物之后才入库");
                return;
            }
            if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.OUTBOUND.getStatus());
                Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), ConveyorStateType.OUTBOUND.getStatus());
                if (jobByWorkNo != null && jobByWorkNo.getJobSts() == ConveyorStateType.OUTBOUND.getStatus()) {
                    staProtocol.setWorkNo(9992);
                    staProtocol.setStaNo(1005);