#

zjj

2024-07-11 b3d902bb16adf735a554d9b3f5d383b014d9697b

#

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java

@@ -377,6 +377,9 @@
        int row = Integer.parseInt(loc.substring(6,8));
        int bay = Integer.parseInt(loc.substring(8,10));
        int lev = Integer.parseInt(loc.substring(10,12));
        if (row == 2){
            row = 3;
        }
        locNo = row +"-"+bay+"-"+lev;
        return locNo;
    }

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/model/enums/TaskStsType.java

@@ -5,7 +5,8 @@
public enum TaskStsType {

    OUT_TASK_OVER(1001,"出库任务完成"),
    OUT_TASK_OVER_HAND(999,"出库任务完成"),
    OUT_TASK_OVER_HAND(999,"手动出库任务完成"),
    IN_TASK_OVER_HAND(998,"手动入库任务完成"),

    NEW_INBOUND(1, "生成入库任务"),
    ANALYZE_INBOUND(2, "入库任务解析"),

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

@@ -140,22 +140,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 +176,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>()