*

L

11 小时以前 9d7bfe8cf15f1b34a87351560f39662d9e141cce

 src/main/java/com/zy/asrs/controller/TaskWrkController.java

@@ -70,6 +70,10 @@
            Integer wrkNo = null;
            String taskNo = null;
            Integer status = null;
            String barcode = null;
            String startPoint = null;
            String targetPoint = null;
            String allField = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
@@ -86,6 +90,14 @@
                    taskNo = val;
                } else if (entry.getKey().equals("status")) {
                    status = Integer.parseInt(val);
                } else if (entry.getKey().equals("barcode")) {
                    barcode = val;
                } else if (entry.getKey().equals("startPoint")) {
                    startPoint = val;
                } else if (entry.getKey().equals("targetPoint")) {
                    targetPoint = val;
                } else if (entry.getKey().equals("allField")) {
                    allField = val;
                }
            }
//
@@ -94,9 +106,9 @@
//            convert(param, wrapper);
//            if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}

            List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
            List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd, curr, limit);
            Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList);
            page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status, barcode, startPoint, targetPoint, allField,modiTimeStart,modiTimeEnd));
            return R.ok(page);
//        return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper));

@@ -311,6 +323,16 @@
    @ManagerAuth(memo = "手动完成任务")
    public R complete(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (Cools.isEmpty(taskWrk)){
            return R.error("任务已不存在") ;
        }
        if (taskWrk.getIoType()==4){
            try{
                return this.delete(taskNo);
            } catch (Exception e) {
                return R.error();
            }
        }
        if ((Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3) && !taskWrk.getStatus().equals(TaskStatusType.OVER3.id)){
            return R.error("已完结或已取消") ;
        }
@@ -394,8 +416,15 @@
    @ManagerAuth(memo = "手动取消任务")
    public R cancel(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (taskWrk == null) {
            return R.error();
        if (Cools.isEmpty(taskWrk)){
            return R.error("任务已不存在") ;
        }
        if (taskWrk.getIoType()==4){
            try{
                return this.delete(taskNo);
            } catch (Exception e) {
                return R.error();
            }
        }
        if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
            return R.error(taskWrk.getTaskNo() + "已被取消");
@@ -485,6 +514,12 @@
    @ManagerAuth(memo = "输送线下发完成")
    public R returnAssign(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (Cools.isEmpty(taskWrk)){
            return R.error("任务已不存在") ;
        }
        if (taskWrk.getIoType()==4){
            return R.error("当前任务不支持此操作") ;
        }
        if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==1){
            taskWrk.setStatus(TaskStatusType.RECEIVE.id);//派发状态
            taskWrk.setWrkSts(2);