Junjie
3 小时以前 a0b49b0d11220c7fefcbe0ca0e938827c16edae4
src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -1122,6 +1122,10 @@
    //调度堆垛机移动
    public synchronized boolean dispatchCrnMove(Integer crnNo, String targetLocNo) {
        return dispatchCrnMove(crnNo, targetLocNo, false);
    }
    public synchronized boolean dispatchCrnMove(Integer crnNo, String targetLocNo, boolean allowQueueWhenBusy) {
        if (crnNo == null || Cools.isEmpty(targetLocNo)) {
            return false;
        }
@@ -1156,16 +1160,18 @@
            return false;
        }
        long runningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
                .eq("crn_no", crnNo)
                .in("wrk_sts",
                        WrkStsType.INBOUND_RUN.sts,
                        WrkStsType.OUTBOUND_RUN.sts,
                        WrkStsType.LOC_MOVE_RUN.sts,
                        WrkStsType.CRN_MOVE_RUN.sts));
        if (runningCount > 0) {
            News.info("堆垛机:{} 存在执行中的任务,暂不生成移动任务", crnNo);
            return false;
        if (!allowQueueWhenBusy) {
            long runningCount = wrkMastService.count(new QueryWrapper<WrkMast>()
                    .eq("crn_no", crnNo)
                    .in("wrk_sts",
                            WrkStsType.INBOUND_RUN.sts,
                            WrkStsType.OUTBOUND_RUN.sts,
                            WrkStsType.LOC_MOVE_RUN.sts,
                            WrkStsType.CRN_MOVE_RUN.sts));
            if (runningCount > 0) {
                News.info("堆垛机:{} 存在执行中的任务,暂不生成移动任务", crnNo);
                return false;
            }
        }
        WrkMast activeTask = wrkMastService.getOne(new QueryWrapper<WrkMast>()