Merge branch 'rcs_master_1.0' into rcs_master_all

zhang

2 天以前 14f2c4fce50c871d84f89d2dca2298e0892b4672

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

@@ -60,7 +60,7 @@
                return;
            }
            if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
                Job jobByWorkNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
                Job jobByWorkNo = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(),ConveyorStateType.OUTBOUND.getStatus());
                if (jobByWorkNo != null && jobByWorkNo.getJobSts() == ConveyorStateType.OUTBOUND.getStatus()) {
                    staProtocol.setWorkNo(9992);
                    staProtocol.setStaNo(1005);