*

lsh

2025-04-30 1bde682d9149b5b55488cfaa277ec1deacab4bee

*

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

@@ -87,9 +87,9 @@
            if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}

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

        } catch (Exception e) {

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

@@ -59,9 +59,9 @@
                }
            }
            List<TaskWrkLog> taskWrkList = taskWrkLogService.selectTaskWrkLogList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit);
            Page<TaskWrkLog> page1 = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
            page1.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            return R.ok(page1);
            Page<TaskWrkLog> page = new Page<TaskWrkLog>(curr, limit).setRecords(taskWrkList);
            page.setTotal(taskWrkLogService.selectTaskWrkLogListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd));
            return R.ok(page);

        } catch (Exception e) {
            return R.error("查询失败,请检查参数:"+e.getMessage());

 src/main/java/com/zy/asrs/entity/TaskWrk.java

@@ -50,7 +50,7 @@
    /**
     * 任务状态 1: 接收  2: 派发  3: 完结  4: 取消
     */
    @ApiModelProperty(value= "任务状态 1: 接收  2: 派发  5: 完结  4: 取消  ")
    @ApiModelProperty(value= "任务状态 1: 接收  2: 派发  5: 完结  4: 取消  9：等待小车搬运")
    @TableField("STATUS")
    private Integer status;


 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -605,7 +605,7 @@
                            if (offer) {
                                log.info("下发输送线任务成功：taskWrk:" + JSON.toJSONString(taskWrk));
                                Date now = new Date();
                                taskWrk.setStatus(5);
                                taskWrk.setStatus(9);
                                taskWrk.setWrkSts(14);
                                taskWrk.setModiTime(now);
                                taskWrk.setCompleteTime(now);

 src/main/java/com/zy/asrs/task/TaskLogScheduler.java

@@ -54,7 +54,8 @@

    @Scheduled(cron = "0/3 * * * * ? ")
    public void execute() throws IOException {
        for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
        List<TaskWrk> taskWrkList = taskWrkService.selectToBeHistoryData();
        for (TaskWrk taskWrk : taskWrkList) {
            JSONObject jsonObject = null;
            String response = null;
            boolean success = false;

 src/main/java/com/zy/core/thread/RgvThread.java

@@ -81,6 +81,9 @@

            // 启动漫游线程
            new Thread(this::taskWalkIssued).start();

            // 启动任务完成线程
            new Thread(this::taskComplete).start();
        }
    }

@@ -102,6 +105,13 @@
    }

    /**
     * 完成
     */
    private void taskComplete() {

    }

    /**
     * 漫游
     */
    private void taskWalkIssued() {