1

zhang

4 天以前 5a6a6c94d0c02732e0be3410d126d652acb8ad10

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

@@ -54,10 +54,16 @@
            if (!staProtocol.isLoading()) {
                return;
            }
            StaProtocol staProtocol5 = devpThread.getStation().get(1005);
            if (staProtocol5.isLoading()){
                log.info("1005有物，等无物之后才入库");
                return;
            }
            if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                Job jobByWorkNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
                if (jobByWorkNo != null && jobByWorkNo.getJobSts() == 1) {
                    staProtocol.setStaNo(1006);
                Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.OUTBOUND.getStatus());
                if (jobByWorkNo != null && jobByWorkNo.getJobSts() == ConveyorStateType.OUTBOUND.getStatus()) {
                    staProtocol.setWorkNo(9992);
                    staProtocol.setStaNo(1005);
                    boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(TaskType.WRITE, staProtocol));
                    if (result) {
                        jobByWorkNo.setJobSts(3);