Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

skyouc

18 小时以前 1d1b053456773c63e51505c8f1be819c0edb2b92

 src/main/java/com/zy/core/utils/DualCrnOperateProcessUtils.java

@@ -105,6 +105,11 @@
            return;
        }

        Object clearLock = redisUtil.get(RedisKeyType.CLEAR_DUAL_CRN_TASK_LIMIT.key + basDualCrnp.getCrnNo());
        if (clearLock != null) {
            return;
        }

        // 如果最近一次是出库模式
        if (dualCrnProtocol.getLastIo().equals("O")) {
            boolean executeResult1 = processLoveMove(basDualCrnp, dualCrnThread);