#

Junjie

16 小时以前 d2f410e1149597b9743c5e195f6b54a1504cf2d4

 src/main/java/com/zy/common/service/CommonService.java

@@ -59,8 +59,8 @@
        }

        int workNo = wrkLastno.getWrkNo();
        int sNo = wrkLastno.getSNo();
        int eNo = wrkLastno.getENo();
        int sNo = wrkLastno.getsNo();
        int eNo = wrkLastno.geteNo();
        workNo = workNo>=eNo ? sNo : workNo+1;
        while (true) {
            WrkMast wrkMast = wrkMastService.selectByWorkNo(workNo);
@@ -147,6 +147,33 @@
        }

        wrkMast.setMk("taskCancel");
        wrkMast.setModiTime(new Date());
        wrkMastService.updateById(wrkMast);
        return true;
    }

    public boolean updateTaskPriorityAndBatchSeq(UpdateTaskPriorityAndBatchSeqParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
        }
        if (Cools.isEmpty(param.getTaskNo())) {
            throw new CoolException("WMS任务号不能为空");
        }
        if (param.getTaskPri() == null && param.getBatchSeq() == null) {
            throw new CoolException("任务优先级和批次序号不能同时为空");
        }

        WrkMast wrkMast = wrkMastService.getOne(new QueryWrapper<WrkMast>().eq("wms_wrk_no", param.getTaskNo()));
        if (wrkMast == null) {
            throw new CoolException("任务不存在");
        }

        if (param.getTaskPri() != null) {
            wrkMast.setIoPri(param.getTaskPri().doubleValue());
        }
        if (param.getBatchSeq() != null) {
            wrkMast.setBatchSeq(param.getBatchSeq());
        }
        wrkMast.setModiTime(new Date());
        wrkMastService.updateById(wrkMast);
        return true;
@@ -503,7 +530,7 @@
        Integer targetStationId = null;
        for (StationObjModel stationObjModel : stationList) {
            try {
                List<NavigateNode> navigateNodes = navigateUtils.calcByStationId(sourceStationId, stationObjModel.getStationId());
                List<NavigateNode> navigateNodes = navigateUtils.calcReachablePathByStationId(sourceStationId, stationObjModel.getStationId());
                if(!navigateNodes.isEmpty()) {
                    targetStationId = stationObjModel.getStationId();
                    break;
@@ -535,7 +562,7 @@
        Integer finalSourceStationId = null;
        for (StationObjModel stationObjModel : stationList) {
            try {
                List<NavigateNode> navigateNodes = navigateUtils.calcByStationId(stationObjModel.getStationId(), targetStationId);
                List<NavigateNode> navigateNodes = navigateUtils.calcReachablePathByStationId(stationObjModel.getStationId(), targetStationId);
                if(!navigateNodes.isEmpty()) {
                    finalSourceStationId = stationObjModel.getStationId();
                    break;