#

Junjie

3 天以前 57d00cb1bd3eb907935fdee4242134820fd4a484

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

@@ -83,8 +83,18 @@
    }

    public boolean completeTask(CompleteTaskParam param) {
        WrkMast wrkMast = null;
        Integer wrkNo = param.getWrkNo();
        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        String taskNo = param.getTaskNo();//wms任务号

        if(wrkNo == null) {
            if (!Cools.isEmpty(taskNo)) {
                wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
            }
        }else {
            wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        }

        if (null == wrkMast) {
            throw new CoolException("任务不存在");
        }
@@ -103,8 +113,18 @@
    }

    public boolean cancelTask(CancelTaskParam param) {
        WrkMast wrkMast = null;
        Integer wrkNo = param.getWrkNo();
        WrkMast wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        String taskNo = param.getTaskNo();//wms任务号

        if(wrkNo == null) {
            if (!Cools.isEmpty(taskNo)) {
                wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wms_wrk_no", taskNo));
            }
        }else {
            wrkMast = wrkMastService.selectByWorkNo(wrkNo);
        }

        if (null == wrkMast) {
            throw new CoolException("任务不存在");
        }