#

zjj

2024-07-12 f456520492f2539be4772eb2c4f6aad3df08f05f

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java

@@ -67,8 +67,17 @@
                taskService.updateById(task);
                continue;
            }else if (task.getMemo().equals("06YZ0001")){
                task.setTaskSts(1001L);
                taskService.updateById(task);
                HashMap<String, String> mesMap = new HashMap<>();
                mesMap.put("taskNo", task.getWmsTaskNo());
                mesMap.put("contNo",task.getZpallet());
                boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",task.getZpallet());
                if (returnTask4){
                    task.setTaskSts(1001L);
                    taskService.updateById(task);
                    log.info("出库任务完成推送mes"+task.getWmsTaskNo());
                }else {
                    log.error("出库任务完成推送mes失败"+task.getWmsTaskNo());
                }
                continue;
            }
            if (task.getTaskNo().equals(basConveyorSta.getTaskNo().toString())) {
@@ -78,6 +87,7 @@
                if (httpRequest){
                    task.setTaskSts(1000L);
                    taskService.updateById(task);
                    log.info("出库任务推送rgv"+task.getWmsTaskNo());
                }else {
                    log.error("出库任务推送rgv失败"+task.getWmsTaskNo());
                }
@@ -140,22 +150,25 @@
    public synchronized void clearCompletedTask() {
        ArrayList<Long> taskSts = new ArrayList<>();
        taskSts.add(TaskStsType.COMPLETE_INBOUND.sts);
        taskSts.add(TaskStsType.OUT_TASK_OVER.sts);
        taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
        taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
        taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
        taskSts.add(TaskStsType.COMPLETE_LADEN_MOVE.sts);


        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getStatus, 1)
                .in(Task::getTaskSts, taskSts));
        for (Task task : tasks) {

            if (Cools.isEmpty(task.getMemo())){
                task.setTaskSts(998L);
                taskService.updateById(task);
                continue;
            }

            HashMap<String, String> mesMap = new HashMap<>();
            mesMap.put("taskNo", task.getWmsTaskNo());
            mesMap.put("contNo",task.getZpallet());
            boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",task.getMemo());
            if (returnTask4){
                log.info("任务完成后上报mes成功，任务号:"+task.getWmsTaskNo());
                //记录库存信息
                updateRecordLoc(task);
                //任务转历史档
@@ -173,6 +186,12 @@
    public synchronized void clearCompletedTask999() {
        ArrayList<Long> taskSts = new ArrayList<>();
        taskSts.add(TaskStsType.OUT_TASK_OVER_HAND.sts);
        taskSts.add(TaskStsType.OUT_TASK_OVER.sts);
        taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
        taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
        taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
        taskSts.add(TaskStsType.COMPLETE_LADEN_MOVE.sts);
        taskSts.add(TaskStsType.IN_TASK_OVER_HAND.sts);


        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()