#

vincentlu

7 天以前 88cce66441b6878c230d30757aaf926b03ef37af

#

 version/db/new.sql

@@ -29,3 +29,10 @@

alter table man_sta
    add outbound_wait int null comment '连续出库等待' after inbound_wait;


alter table man_task
    add uplink_sts varchar(64) null comment '上行状态' after empty_mk;

alter table man_task_log
    add uplink_sts varchar(64) null comment '上行状态' after empty_mk;

 version/doc/RCS¿ª·¢½ø¶È±í.xlsx

Binary files differ

 zy-acs-flow/src/i18n/en.js

@@ -485,6 +485,7 @@
                destLoc: "dest loc",
                destCode: "dest code",
                emptyMk: "empty mk",
                uplinkSts: "uplink status",
                zpallet: "zpallet",
                phase: "ideal path",
                errDesc: "error",

 zy-acs-flow/src/i18n/zh.js

@@ -485,6 +485,7 @@
                destLoc: "目标库位",
                destCode: "目标地面码",
                emptyMk: "空料箱",
                uplinkSts: "上行状态",
                zpallet: "料箱码",
                phase: "理想路径",
                errDesc: "异常描述",

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/wms/TaskReportService.java

@@ -9,6 +9,8 @@
import com.zy.acs.manager.core.integrate.dto.HttpResult;
import com.zy.acs.manager.core.service.ThreadPoolRegulator;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.enums.TaskUplinkStateType;
import com.zy.acs.manager.manager.service.TaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +53,14 @@
        if (!uplinkProperties.getEnabled()) {
            return false;
        }
        if (!task.getTaskSts().equals(TaskStsType.COMPLETE.val())) {
            return false;
        }
        TaskUplinkStateType uplinkStateType = TaskUplinkStateType.of(task.getUplinkSts());
        if (!uplinkStateType.equals(TaskUplinkStateType.PENDING) && !uplinkStateType.equals(TaskUplinkStateType.FAILED)) {
            return false;
        }

        // block
//        Future<R> future = threadPoolRegulator.getInstance().submit(() -> {
//            mapDataDispatcher.modifyDynamicMatrix(null, null, param.getAgvNo(), true);

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java

@@ -18,202 +18,106 @@

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * ç¼–号
     */
    @ApiModelProperty(value= "编号")
    private String uuid;

    /**
     * æ€»çº¿
     */
    @ApiModelProperty(value= "总线")
    private Long busId;

    /**
     * ä»»åŠ¡å·
     */
    @ApiModelProperty(value= "任务号")
    private String seqNum;

    /**
     * ä¼˜å…ˆçº§
     */
    @ApiModelProperty(value= "优先级")
    private Integer priority;

    /**
     * åç§°
     */
    @ApiModelProperty(value= "名称")
    private String name;

    /**
     * ä»»åŠ¡è¿›åº¦
     */
    @ApiModelProperty(value= "任务进度")
    private Long taskSts;

    /**
     * ä»»åŠ¡ç±»åž‹
     */
    @ApiModelProperty(value= "任务类型")
    private Long taskType;

    /**
     * AGV
     */
    @ApiModelProperty(value= "AGV")
    private Long agvId;

    /**
     * å·¥ä½œæ—¶é—´
     */
    @ApiModelProperty(value= "工作时间")
    private Date ioTime;

    /**
     * å¼€å§‹æ—¶é—´
     */
    @ApiModelProperty(value= "开始时间")
    private Date startTime;

    /**
     * ç»“束时间
     */
    @ApiModelProperty(value= "结束时间")
    private Date endTime;

    /**
     * å¼‚常时间
     */
    @ApiModelProperty(value= "异常时间")
    private Date errTime;

    /**
     * èµ·å§‹ç«™
     */
    @ApiModelProperty(value= "起始站")
    private Long oriSta;

    /**
     * èµ·å§‹åº“位
     */
    @ApiModelProperty(value= "起始库位")
    private Long oriLoc;

    /**
     * èµ·å§‹ç 
     */
    @ApiModelProperty(value= "起始码")
    private Long oriCode;

    /**
     * èµ·å§‹å··é“哈希
     */
    @ApiModelProperty(value= "起始巷道哈希")
    private String oriLaneHash;

    /**
     * ç›®æ ‡ç«™
     */
    @ApiModelProperty(value= "目标站")
    private Long destSta;

    /**
     * ç›®æ ‡åº“位
     */
    @ApiModelProperty(value= "目标库位")
    private Long destLoc;

    /**
     * ç›®æ ‡ç 
     */
    @ApiModelProperty(value= "目标码")
    private Long destCode;

    /**
     * ç›®æ ‡å··é“哈希
     */
    @ApiModelProperty(value= "目标巷道哈希")
    private String destLaneHash;

    /**
     * ç©ºæ¿
     */
    @ApiModelProperty(value= "空板")
    private String emptyMk;

    /**
     * æ‰˜ç›˜ç 
     */
    @ApiModelProperty(value= "上行状态")
    private String uplinkSts;

    @ApiModelProperty(value= "托盘码")
    private String zpallet;

    /**
     * çŽ¯èŠ‚
     */
    @ApiModelProperty(value= "环节")
    private String phase;

    /**
     * å¼‚常描述
     */
    @ApiModelProperty(value= "异常描述")
    private String errDesc;

    /**
     * çŠ¶æ€ 1: æ­£å¸¸  0: å†»ç»“  
     */
    @ApiModelProperty(value= "状态 1: æ­£å¸¸  0: å†»ç»“  ")
    private Integer status;

    /**
     * æ˜¯å¦åˆ é™¤ 1: æ˜¯  0: å¦  
     */
    @ApiModelProperty(value= "是否删除 1: æ˜¯  0: å¦  ")
    private Integer deleted;

    /**
     * ç§Ÿæˆ·
     */
    @ApiModelProperty(value= "租户")
    private Long tenantId;

    /**
     * æ·»åŠ äººå‘˜
     */
    @ApiModelProperty(value= "添加人员")
    private Long createBy;

    /**
     * æ·»åŠ æ—¶é—´
     */
    @ApiModelProperty(value= "添加时间")
    private Date createTime;

    /**
     * ä¿®æ”¹äººå‘˜
     */
    @ApiModelProperty(value= "修改人员")
    private Long updateBy;

    /**
     * ä¿®æ”¹æ—¶é—´
     */
    @ApiModelProperty(value= "修改时间")
    private Date updateTime;

    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty(value= "备注")
    private String memo;


 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/TaskUplinkStateType.java

New file
@@ -0,0 +1,28 @@
package com.zy.acs.manager.manager.enums;

import com.zy.acs.framework.common.Cools;

public enum TaskUplinkStateType {

    NONE,       // æœªçŸ¥
    PENDING,    // å¾…上报
    SENDING,    // ä¸ŠæŠ¥ä¸­
    SUCCESS,    // æˆåŠŸ
    FAILED,     // å¤±è´¥

    SKIPPED,    // è·³è¿‡
    ;

    public static TaskUplinkStateType of(String state) {
        if (Cools.isEmpty(state)) {
            return NONE;
        }
        for (TaskUplinkStateType type : TaskUplinkStateType.values()) {
            if (type.toString().equals(state)) {
                return type;
            }
        }
        return NONE;
    }

}