src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -24,91 +24,91 @@ * ID */ @ApiModelProperty(value= "ID") @TableId(value = "\"id\"", type = IdType.AUTO) @TableId(value = "\"ID\"", type = IdType.AUTO) private Long id; /** * 日志编号 */ @ApiModelProperty(value= "日志编号") @TableField("\"uuid\"") @TableField("\"UUID\"") private String uuid; /** * 名称空间 */ @ApiModelProperty(value= "名称空间") @TableField("\"namespace\"") @TableField("\"NAMESPACE\"") private String namespace; /** * 接口地址 */ @ApiModelProperty(value= "接口地址") @TableField("\"url\"") @TableField("\"URL\"") private String url; /** * 平台密钥 */ @ApiModelProperty(value= "平台密钥") @TableField("\"appkey\"") @TableField("\"APPKEY\"") private String appkey; /** * 时间戳 */ @ApiModelProperty(value= "时间戳") @TableField("\"timestamp\"") @TableField("\"TIMESTAMP\"") private String timestamp; /** * 客户端IP */ @ApiModelProperty(value= "客户端IP") @TableField("\"clientIp\"") @TableField("\"CLIENT_IP\"") private String clientIp; /** * 请求内容 */ @ApiModelProperty(value= "请求内容") @TableField("\"request\"") @TableField("\"REQUEST\"") private String request; /** * 响应内容 */ @ApiModelProperty(value= "响应内容") @TableField("\"response\"") @TableField("\"RESPONSE\"") private String response; /** * 异常内容 */ @ApiModelProperty(value= "异常内容") @TableField("\"err\"") @TableField("\"ERR\"") private String err; /** * 结果 1: 成功 0: 失败 */ @ApiModelProperty(value= "结果 1: 成功 0: 失败 ") @TableField("\"result\"") @TableField("\"RESULT\"") private Integer result; /** * 状态 1: 正常 0: 禁用 */ @ApiModelProperty(value= "状态 1: 正常 0: 禁用 ") @TableField("\"status\"") @TableField("\"STATUS\"") private Integer status; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("\"createTime\"") @TableField("\"CREATE_TIME\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -116,7 +116,7 @@ * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("\"updateTime\"") @TableField("\"UPDATE_TIME\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; @@ -124,7 +124,7 @@ * 备注 */ @ApiModelProperty(value= "备注") @TableField("\"memo\"") @TableField("\"MEMO\"") private String memo; public ApiLog() {} src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -23,42 +23,42 @@ * 异常代号 */ @ApiModelProperty(value= "异常代号") @TableId(value = "\"errorCode\"", type = IdType.AUTO) @TableId(value = "\"ERROR_CODE\"", type = IdType.AUTO) private Long errorCode; /** * 异常描述 */ @ApiModelProperty(value= "异常描述") @TableField("\"err_name\"") @TableField("\"ERR_NAME\"") private String errName; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("\"modi_user\"") @TableField("\"MODI_USER\"") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("\"modi_time\"") @TableField("\"MODI_TIME\"") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("\"appe_user\"") @TableField("\"APPE_USER\"") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("\"appe_time\"") @TableField("\"APPE_TIME\"") private Date appeTime; public BasCrnError() {} src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -23,42 +23,42 @@ * 工作代号 */ @ApiModelProperty(value= "状态代号") @TableId(value = "\"sts_no\"", type = IdType.INPUT) @TableId(value = "\"STS_NO\"", type = IdType.INPUT) private String stsNo; /** * 状态描述 */ @ApiModelProperty(value= "状态描述") @TableField("\"sts_desc\"") @TableField("\"STS_DESC\"") private String stsDesc; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("\"modi_user\"") @TableField("\"MODI_USER\"") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("\"modi_time\"") @TableField("\"MODI_TIME\"") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("\"appe_user\"") @TableField("\"APPE_USER\"") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("\"appe_time\"") @TableField("\"APPE_TIME\"") private Date appeTime; public BasCrnStatus() {} src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -25,204 +25,209 @@ * 编号 */ @ApiModelProperty(value= "编号") @TableId(value = "\"dev_no\"", type = IdType.INPUT) @TableId(value = "\"DEV_NO\"", type = IdType.INPUT) private Integer devNo; /** * 设备描述 */ @ApiModelProperty(value= "设备描述") @TableField("\"dec_desc\"") @TableField("\"DEC_DESC\"") private String decDesc; /** * 备注 */ @ApiModelProperty(value= "备注") @TableField("\"dev_mk\"") @TableField("\"DEV_MK\"") private String devMk; /** * 可入 */ @ApiModelProperty(value= "可入") @TableField("\"in_enable\"") @TableField("\"IN_ENABLE\"") private String inEnable; /** * 可出 */ @ApiModelProperty(value= "可出") @TableField("\"out_enable\"") @TableField("\"OUT_ENABLE\"") private String outEnable; /** * 自动 */ @ApiModelProperty(value= "自动") @TableField("\"autoing\"") @TableField("\"AUTOING\"") private String autoing; /** * 有物 */ @ApiModelProperty(value= "有物") @TableField("\"loading\"") @TableField("\"LOADING\"") private String loading; /** * 能入 */ @ApiModelProperty(value= "能入") @TableField("\"canining\"") @TableField("\"CANINING\"") private String canining; /** * 能出 */ @ApiModelProperty(value= "能出") @TableField("\"canouting\"") @TableField("\"CANOUTING\"") private String canouting; @ApiModelProperty(value= "") @TableField("\"fronting\"") @TableField("\"FRONTING\"") private String fronting; @ApiModelProperty(value= "") @TableField("\"rearing\"") @TableField("\"REARING\"") private String rearing; @ApiModelProperty(value= "") @TableField("\"uping\"") @TableField("\"UPING\"") private String uping; @ApiModelProperty(value= "") @TableField("\"downing\"") @TableField("\"DOWNING\"") private String downing; /** * 需求1 */ @ApiModelProperty(value= "需求1") @TableField("\"INREQ1\"") private String inreq1; /** * 需求2 */ @ApiModelProperty(value= "需求2") @TableField("\"INREQ2\"") private String inreq2; /** * 工作号 */ @ApiModelProperty(value= "工作号") @TableField("wrk_no") @TableField("WRK_NO") private Integer wrkNo; @ApiModelProperty(value= "") @TableField("wrk_no1") @TableField("WRK_NO1") private Integer wrkNo1; /** * 容器类型 */ @ApiModelProperty(value= "容器类型") @TableField("ctn_type") @TableField("CTN_TYPE") private Integer ctnType; /** * 条形码 */ @ApiModelProperty(value= "条形码") @TableField("BARCODE") private String barcode; @ApiModelProperty(value= "入库暂存数") @TableField("in_qty") @TableField("IN_QTY") private Integer inQty; @ApiModelProperty(value= "") @TableField("ROW1") private Integer row1; @ApiModelProperty(value= "") @TableField("io_time") @TableField("IO_TIME") private Date ioTime; @ApiModelProperty(value= "") @TableField("AREA") private String area; @ApiModelProperty(value= "") @TableField("in_ok") @TableField("IN_OK") private String inOk; @ApiModelProperty(value= "") @TableField("out_ok") @TableField("OUT_OK") private String outOk; @ApiModelProperty(value= "高低类型{0:未知,1:低库位,2:高库位}") @TableField("loc_type1") @TableField("LOC_TYPE1") private Short locType1; @ApiModelProperty(value= "宽窄类型{0:未知,1:窄库位,2:宽库位}") @TableField("loc_type2") @TableField("LOC_TYPE2") private Short locType2; @ApiModelProperty(value= "轻重类型{0:未知,1:轻库位,2:重库位}") @TableField("loc_type3") @TableField("LOC_TYPE3") private Short locType3; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("MODI_USER") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("MODI_TIME") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") @TableField("APPE_USER") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @TableField("APPE_TIME") private Date appeTime; @ApiModelProperty(value= "") @TableField("std_qty") @TableField("STD_QTY") private Double stdQty; @ApiModelProperty(value= "") @TableField("min_wt") @TableField("MIN_WT") private Double minWt; @ApiModelProperty(value= "") @TableField("max_wt") @TableField("MAX_WT") private Double maxWt; /** * 重量 */ @ApiModelProperty(value= "重量") @TableField("gross_wt") @TableField("GROSS_WT") private Double grossWt; @ApiModelProperty(value= "") @TableField("cart_pos") @TableField("CART_POS") private Integer cartPos; @ApiModelProperty(value= "异常码") @TableField("sta_err") @TableField("STA_ERR") private Integer staErr;
@@ -23,43 +23,43 @@ * 库位状态代号 */ @ApiModelProperty(value= "库位状态代号") @TableId(value = "loc_sts", type = IdType.INPUT) @TableField("loc_sts") @TableId(value = "LOC_STS", type = IdType.INPUT) @TableField("LOC_STS") private String locSts; /** * 库位状态描述 */ @ApiModelProperty(value= "库位状态描述") @TableField("loc_desc") @TableField("LOC_DESC") private String locDesc; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("MODI_USER") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("MODI_TIME") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") @TableField("APPE_USER") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @TableField("APPE_TIME") private Date appeTime; public BasLocSts() {} src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -23,43 +23,43 @@ * 异常编号 */ @ApiModelProperty(value= "异常编号") @TableId(value = "error_code", type = IdType.INPUT) @TableField("error_code") @TableId(value = "ERROR_CODE", type = IdType.INPUT) @TableField("ERROR_CODE") private Integer errorCode; /** * 异常描述 */ @ApiModelProperty(value= "异常描述") @TableField("error_desc") @TableField("ERROR_DESC") private String errorDesc; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("MODI_TIME") private Date modiTime; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("MODI_USER") private Long modiUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @TableField("APPE_TIME") private Date appeTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") @TableField("APPE_USER") private Long appeUser; public BasPlcerror() {} src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java
@@ -37,21 +37,21 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "") @TableId(value = "id", type = IdType.AUTO) @TableId(value = "ID", type = IdType.AUTO) private Long id; /** * 工作号 */ @ApiModelProperty(value= "工作号") @TableField("wrk_no") @TableField("WRK_NO") private Integer wrkNo; /** * 开始时间 */ @ApiModelProperty(value= "开始时间") @TableField("start_time") @TableField("START_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date startTime; @@ -59,7 +59,7 @@ * 结束时间 */ @ApiModelProperty(value= "结束时间") @TableField("end_time") @TableField("END_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endTime; @@ -67,81 +67,84 @@ * 工作状态 */ @ApiModelProperty(value= "工作状态") @TableField("wrk_sts") @TableField("WRK_STS") private Long wrkSts; /** * 入出库类型 */ @ApiModelProperty(value= "入出库类型") @TableField("io_type") @TableField("IO_TYPE") private Integer ioType; /** * plc */ @ApiModelProperty(value= "plc") @TableField("plc_no") @TableField("PLC_NO") private Integer plcNo; /** * 目标库位 */ @ApiModelProperty(value= "目标库位") @TableField("loc_no") @TableField("LOC_NO") private String locNo; /** * 目标站 */ @ApiModelProperty(value= "目标站") @TableField("sta_no") @TableField("STA_NO") private Integer staNo; /** * 源站 */ @ApiModelProperty(value= "源站") @TableField("source_sta_no") @TableField("SOURCE_STA_NO") private Integer sourceStaNo; /** * 源库位 */ @ApiModelProperty(value= "源库位") @TableField("source_loc_no") @TableField("SOURCE_LOC_NO") private String sourceLocNo; /** * 条码 */ @ApiModelProperty(value= "条码") @TableField("BARCODE") private String barcode; /** * 异常编号 */ @ApiModelProperty(value= "异常编号") @TableField("err_code") @TableField("ERR_CODE") private Integer errCode; /** * 异常描述 */ @ApiModelProperty(value= "异常描述") @TableField("ERR") private String err; /** * 异常情况 1: 未处理 2: 已修复 */ @ApiModelProperty(value= "异常情况 1: 未处理 2: 已修复 ") @TableField("STATUS") private Integer status; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("create_time") @TableField("CREATE_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -149,14 +152,14 @@ * 添加人员 */ @ApiModelProperty(value= "添加人员") @TableField("create_by") @TableField("CREATE_BY") private Long createBy; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("update_time") @TableField("UPDATE_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; @@ -164,13 +167,14 @@ * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("update_by") @TableField("UPDATE_BY") private Long updateBy; /** * 备注 */ @ApiModelProperty(value= "备注") @TableField("MEMO") private String memo; public BasPlcerrorLog() {} src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -23,50 +23,50 @@ * 入出类型代号 */ @ApiModelProperty(value= "入出类型代号") @TableId(value = "io_type", type = IdType.INPUT) @TableField("io_type") @TableId(value = "IO_TYPE", type = IdType.INPUT) @TableField("IO_TYPE") private Integer ioType; /** * 主要 */ @ApiModelProperty(value= "主要") @TableField("io_pri") @TableField("IO_PRI") private String ioPri; /** * 入出类型描述 */ @ApiModelProperty(value= "入出类型描述") @TableField("io_desc") @TableField("IO_DESC") private String ioDesc; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("MODI_USER") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("MODI_TIME") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") @TableField("APPE_USER") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @TableField("APPE_TIME") private Date appeTime; public BasWrkIotype() {} src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -23,43 +23,43 @@ * 代号 */ @ApiModelProperty(value= "代号") @TableId(value = "wrk_sts", type = IdType.INPUT) @TableField("wrk_sts") @TableId(value = "WRK_STS", type = IdType.INPUT) @TableField("WRK_STS") private Long wrkSts; /** * 状态描述 */ @ApiModelProperty(value= "状态描述") @TableField("wrk_desc") @TableField("WRK_DESC") private String wrkDesc; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("MODI_USER") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("MODI_TIME") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") @TableField("APPE_USER") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @TableField("APPE_TIME") private Date appeTime; public BasWrkStatus() {} src/main/java/com/zy/asrs/entity/CommandInfo.java
@@ -21,35 +21,35 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "") @TableId(value = "id", type = IdType.AUTO) @TableId(value = "ID", type = IdType.AUTO) private Integer id; /** * 工作号 */ @ApiModelProperty(value= "工作号") @TableField("wrk_no") @TableField("WRK_NO") private Integer wrkNo; /** * WMS任务号 */ @ApiModelProperty(value= "任务号") @TableField("task_no") @TableField("TASK_NO") private String taskNo; /** * 指令类型{1:创建,2:执行,3:完成} */ @ApiModelProperty(value= "指令状态") @TableField("command_status") @TableField("COMMAND_STATUS") private Integer commandStatus; /** * 开始时间 */ @ApiModelProperty(value= "开始时间") @TableField("start_time") @TableField("START_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date startTime; @@ -57,41 +57,42 @@ * 指令类型 */ @ApiModelProperty(value= "指令类型") @TableField("command_type") @TableField("COMMAND_TYPE") private Integer commandType; /** * 设备 */ @ApiModelProperty(value= "设备") @TableField("DEVICE") private String device; /** * 设备执行信息 */ @ApiModelProperty(value= "设备执行信息") @TableField("device_log") @TableField("DEVICE_LOG") private String deviceLog; /** * 命令描述 */ @ApiModelProperty(value= "命令描述") @TableField("command_desc") @TableField("COMMAND_DESC") private String commandDesc; /** * 命令JSON */ @ApiModelProperty(value= "命令JSON") @TableField("command") @TableField("COMMAND") private String command; /** * 执行时间 */ @ApiModelProperty(value= "执行时间") @TableField("execute_time") @TableField("EXECUTE_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date executeTime; @@ -99,7 +100,7 @@ * 完成时间 */ @ApiModelProperty(value= "完成时间") @TableField("complete_time") @TableField("COMPLETE_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date completeTime;
@@ -25,42 +25,42 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "") @TableId(value = "id", type = IdType.AUTO) @TableId(value = "ID", type = IdType.AUTO) private Integer id; /** * 工作号 */ @ApiModelProperty(value= "工作号") @TableField("wrk_no") @TableField("WRK_NO") private Integer wrkNo; /** * 起点位置 */ @ApiModelProperty(value= "起点位置") @TableField("start_pos") @TableField("START_POS") private String startPos; /** * 终点位置 */ @ApiModelProperty(value= "终点位置") @TableField("end_pos") @TableField("END_POS") private String endPos; /** * 指令状态 1: 创建 2: 执行 3: 完成 */ @ApiModelProperty(value= "指令状态 1: 创建 2: 执行 3: 完成 ") @TableField("command_status") @TableField("COMMAND_STATUS") private Integer commandStatus; /** * 创建时间 */ @ApiModelProperty(value= "创建时间") @TableField("start_time") @TableField("START_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date startTime; @@ -68,47 +68,49 @@ * 指令类型 */ @ApiModelProperty(value= "指令类型") @TableField("command_type") @TableField("COMMAND_TYPE") private Integer commandType; /** * 设备 */ @ApiModelProperty(value= "设备") @TableField("DEVICE") private String device; /** * 设备执行信息 */ @ApiModelProperty(value= "设备执行信息") @TableField("device_log") @TableField("DEVICE_LOG") private String deviceLog; /** * 命令描述 */ @ApiModelProperty(value= "命令描述") @TableField("command_desc") @TableField("COMMAND_DESC") private String commandDesc; /** * 命令JSON */ @ApiModelProperty(value= "命令JSON") @TableField("COMMAND") private String command; /** * 任务号 */ @ApiModelProperty(value= "任务号") @TableField("task_no") @TableField("TASK_NO") private String taskNo; /** * 执行时间 */ @ApiModelProperty(value= "执行时间") @TableField("execute_time") @TableField("EXECUTE_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date executeTime; @@ -116,7 +118,7 @@ * 完成时间 */ @ApiModelProperty(value= "完成时间") @TableField("complete_time") @TableField("COMPLETE_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date completeTime;
@@ -19,25 +19,28 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "") @TableId(value = "id", type = IdType.AUTO) @TableId(value = "ID", type = IdType.AUTO) private Integer id; @ApiModelProperty(value= "") @TableField("DATA") private String data; @ApiModelProperty(value= "") @TableField("NAME") private String name; @ApiModelProperty(value= "") @TableField("resource_id") @TableField("RESOURCE_ID") private Integer resourceId; @ApiModelProperty(value= "") @TableField("create_time") @TableField("CREATE_TIME") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @ApiModelProperty(value= "备注") @TableField("MEMO") private String memo; public DataResource() {} src/main/java/com/zy/asrs/entity/DeviceError.java
@@ -19,28 +19,28 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "") @TableId(value = "\"id\"", type = IdType.AUTO) @TableId(value = "\"ID\"", type = IdType.AUTO) private Long id; /** * 设备 */ @ApiModelProperty(value= "设备") @TableField("\"device\"") @TableField("\"DEVICE\"") private String device; /** * 设备ID */ @ApiModelProperty(value= "设备ID") @TableField("\"device_id\"") @TableField("\"DEVICE_ID\"") private Integer deviceId; /** * 创建时间 */ @ApiModelProperty(value= "创建时间") @TableField("\"create_time\"") @TableField("\"CREATE_TIME\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -48,6 +48,7 @@ * 异常信息 */ @ApiModelProperty(value= "异常信息") @TableField("\"MSG\"") private String msg; public DeviceError() {} src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -22,7 +22,7 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "库位号") @TableField("loc_no") @TableField("LOC_NO") private String locNo; @ApiModelProperty(value= "托盘条码") src/main/java/com/zy/asrs/entity/LocMast.java
@@ -26,15 +26,15 @@ * 库位号 */ @ApiModelProperty(value= "库位号") @TableId(value = "loc_no", type = IdType.INPUT) @TableField("loc_no") @TableId(value = "LOC_NO", type = IdType.INPUT) @TableField("LOC_NO") private String locNo; /** * 库位类型 */ @ApiModelProperty(value= "库位类型") @TableField("whs_type") @TableField("WHS_TYPE") private Long whsType; @ApiModelProperty(value= "") src/main/java/com/zy/asrs/entity/MatCode.java
@@ -23,14 +23,15 @@ * 商品编号 */ @ApiModelProperty(value= "商品编号") @TableId(value = "mat_no", type = IdType.INPUT) @TableField("mat_no") @TableId(value = "MAT_NO", type = IdType.INPUT) @TableField("MAT_NO") private String matNo; /** * 条码 */ @ApiModelProperty(value= "条形码") @TableField("BARCODE") private String barcode; /** src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -23,81 +23,82 @@ * 类别 */ @ApiModelProperty(value= "类别") @TableId(value = "whs_type", type = IdType.INPUT) @TableField("whs_type") @TableId(value = "WHS_TYPE", type = IdType.INPUT) @TableField("WHS_TYPE") private Integer whsType; /** * 当前工作号 */ @ApiModelProperty(value= "当前工作号") @TableField("wrk_mk") @TableField("WRK_MK") private String wrkMk; /** * 当前排号 */ @ApiModelProperty(value= "当前排号") @TableField("current_row") @TableField("CURRENT_ROW") private Integer currentRow; /** * 起始排号 */ @ApiModelProperty(value= "起始排号") @TableField("s_row") @TableField("S_ROW") private Integer sRow; /** * 终止排号 */ @ApiModelProperty(value= "终止排号") @TableField("e_row") @TableField("E_ROW") private Integer eRow; /** * 堆垛机数量 */ @ApiModelProperty(value= "堆垛机数量") @TableField("crn_qty") @TableField("CRN_QTY") private Integer crnQty; /** * 备注 */ @ApiModelProperty(value= "备注") @TableField("MEMO") private String memo; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("MODI_USER") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("MODI_TIME") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") @TableField("APPE_USER") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @TableField("APPE_TIME") private Date appeTime; @ApiModelProperty(value= "") @TableField("limint_loc") @TableField("LIMINT_LOC") private Integer limintLoc; public RowLastno() {} src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -26,87 +26,88 @@ * 路径ID */ @ApiModelProperty(value= "路径ID") @TableId(value = "type_id", type = IdType.AUTO) @TableField("type_id") @TableId(value = "TYPE_ID", type = IdType.AUTO) @TableField("TYPE_ID") private Long typeId; /** * 入出库类型 */ @ApiModelProperty(value= "入出库类型") @TableId(value = "type_no", type = IdType.INPUT) @TableField("type_no") @TableId(value = "TYPE_NO", type = IdType.INPUT) @TableField("TYPE_NO") private Integer typeNo; /** * 作业类型 */ @ApiModelProperty(value= "作业类型") @TableField("type_desc") @TableField("TYPE_DESC") private String typeDesc; /** * 作业站点 */ @ApiModelProperty(value= "作业站点") @TableId(value = "stn_no", type = IdType.INPUT) @TableField("stn_no") @TableId(value = "STN_NO", type = IdType.INPUT) @TableField("STN_NO") private Integer stnNo; /** * 站点名称 */ @ApiModelProperty(value= "站点名称") @TableField("stn_desc") @TableField("STN_DESC") private String stnDesc; /** * 堆垛机号 */ @ApiModelProperty(value= "堆垛机号") @TableId(value = "crn_no", type = IdType.INPUT) @TableField("crn_no") @TableId(value = "CRN_NO", type = IdType.INPUT) @TableField("CRN_NO") private Integer crnNo; /** * 堆垛机站点 */ @ApiModelProperty(value= "堆垛机站点") @TableField("crn_stn") @TableField("CRN_STN") private Integer crnStn; /** * 备注 */ @ApiModelProperty(value= "备注") @TableField("MEMO") private String memo; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("MODI_USER") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("MODI_TIME") private Date modiTime; /** * 创建者 */ @ApiModelProperty(value= "创建者") @TableField("appe_user") @TableField("APPE_USER") private Long appeUser; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("appe_time") @TableField("APPE_TIME") private Date appeTime; public StaDesc() {} src/main/resources/application-prod.yml
@@ -12,7 +12,7 @@ bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 192.168.1.100 ip: 192.168.4.250 crnInStn[0]: #堆垛机入库站点1 staNo: 100 row: 1 @@ -32,7 +32,7 @@ bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 192.168.1.110 ip: 192.168.4.250 crnInStn[0]: #堆垛机入库站点1 staNo: 102 row: 4 @@ -42,20 +42,62 @@ id: 2 slot: 0 demo: false barcode[3]: #条码扫描仪4 port: 51236 ip: 10.10.10.52 id: 4 barcode[2]: #条码扫描仪3 port: 51236 ip: 10.10.10.52 crn[2]: #堆垛机3 rack: 0 offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 port: 102 crnOutStn[0]: #堆垛机出库站点 staNo: 105 row: 9 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 192.168.4.250 crnInStn[0]: #堆垛机入库站点1 staNo: 104 row: 8 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} id: 3 slot: 0 demo: false crn[3]: #堆垛机4 rack: 0 offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 port: 102 crnOutStn[0]: #堆垛机出库站点 staNo: 107 row: 12 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 192.168.4.250 crnInStn[0]: #堆垛机入库站点1 staNo: 106 row: 11 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} id: 4 slot: 0 demo: false barcode[0]: #条码扫描仪1 port: 51236 ip: 10.10.10.52 id: 1 barcode[1]: #条码扫描仪2 port: 51236 ip: 10.10.10.52 ip: 192.168.4.250 id: 2 barcode[2]: #条码扫描仪3 port: 51236 ip: 192.168.4.250 id: 3 barcode[3]: #条码扫描仪4 port: 51236 ip: 192.168.4.250 id: 4 devp[0]: #输送线 emptyInSta[2]: #空板入库口3 staNo: 104 @@ -64,7 +106,7 @@ rack: 0 emptyInSta[0]: #空板入库口1 staNo: 100 ip: 192.168.1.140 ip: 192.168.4.250 outSta[4]: #出库口5 staNo: 104 outSta[3]: #出库口4 @@ -98,425 +140,3 @@ staNo: 102 barcode: ${wcs-slave.barcode[1].id} id: 1 barcode[0]: #条码扫描仪1 port: 51236 ip: 10.10.10.52 id: 1 crn[2]: #堆垛机3 rack: 0 offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 port: 102 crnOutStn[0]: #堆垛机出库站点 staNo: 105 row: 9 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 192.168.1.120 crnInStn[0]: #堆垛机入库站点1 staNo: 104 row: 8 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} id: 3 slot: 0 demo: false crn[3]: #堆垛机4 rack: 0 offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 port: 102 crnOutStn[0]: #堆垛机出库站点 staNo: 107 row: 12 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} ip: 192.168.1.130 crnInStn[0]: #堆垛机入库站点1 staNo: 106 row: 11 bay: 1 lev: 1 devpPlcId: ${wcs-slave.devp[0].id} id: 4 slot: 0 demo: false # crn[0]: #堆垛机1 # id: 1 # ip: 172.17.91.2 # slot: 0 # demo: false # rack: 0 # offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 # port: 102 # crnOutStn[0]: #堆垛机出库站点 # staNo: 100 # row: 2 # bay: 1 # lev: 1 # devpPlcId: ${wcs-slave.devp[0].id} # crnInStn[0]: #堆垛机入库站点1 # staNo: 103 # row: 3 # bay: 1 # lev: 1 # backSta: 102 # devpPlcId: ${wcs-slave.devp[0].id} # crnOutStn[1]: #堆垛机出库站点 # staNo: 200 # row: 2 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crnInStn[1]: #堆垛机入库站点2 # staNo: 205 # row: 3 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crn[1]: #堆垛机2 # id: 2 # ip: 172.17.91.7 # slot: 0 # demo: false # rack: 0 # offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 # port: 102 # crnOutStn[0]: #堆垛机出库站点 # staNo: 104 # row: 5 # bay: 1 # lev: 1 # devpPlcId: ${wcs-slave.devp[0].id} # crnInStn[0]: #堆垛机入库站点1 # staNo: 107 # row: 6 # bay: 1 # lev: 1 # backSta: 106 # devpPlcId: ${wcs-slave.devp[0].id} # crnOutStn[1]: #堆垛机出库站点 # staNo: 206 # row: 5 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crnInStn[1]: #堆垛机入库站点2 # staNo: 211 # row: 6 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crn[2]: #堆垛机3 # id: 3 # ip: 172.17.91.12 # slot: 0 # demo: false # rack: 0 # offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 # port: 102 # crnOutStn[0]: #堆垛机出库站点 # staNo: 108 # row: 8 # bay: 1 # lev: 1 # devpPlcId: ${wcs-slave.devp[0].id} # crnInStn[0]: #堆垛机入库站点1 # staNo: 111 # row: 9 # bay: 1 # lev: 1 # backSta: 110 # devpPlcId: ${wcs-slave.devp[0].id} # crnOutStn[1]: #堆垛机出库站点 # staNo: 212 # row: 8 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crnInStn[1]: #堆垛机入库站点2 # staNo: 217 # row: 9 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crn[3]: #堆垛机4 # id: 4 # ip: 172.17.91.17 # slot: 0 # demo: false # rack: 0 # offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 # port: 102 # crnOutStn[0]: #堆垛机出库站点 # staNo: 112 # row: 12 # bay: 1 # lev: 1 # devpPlcId: ${wcs-slave.devp[0].id} # crnInStn[0]: #堆垛机入库站点1 # staNo: 115 # row: 13 # bay: 1 # lev: 1 # backSta: 114 # devpPlcId: ${wcs-slave.devp[0].id} # crnOutStn[1]: #堆垛机出库站点 # staNo: 218 # row: 12 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crnInStn[1]: #堆垛机入库站点2 # staNo: 223 # row: 13 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crn[4]: #堆垛机5 # id: 5 # ip: 172.17.91.22 # slot: 0 # demo: false # rack: 0 # offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 # port: 102 # crnOutStn[0]: #堆垛机出库站点 # staNo: 116 # row: 16 # bay: 1 # lev: 1 # devpPlcId: ${wcs-slave.devp[0].id} # crnInStn[0]: #堆垛机入库站点1 # staNo: 119 # row: 17 # bay: 1 # lev: 1 # backSta: 118 # devpPlcId: ${wcs-slave.devp[0].id} # crnOutStn[1]: #堆垛机出库站点 # staNo: 224 # row: 16 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crnInStn[1]: #堆垛机入库站点2 # staNo: 229 # row: 17 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crn[5]: #堆垛机6 # id: 6 # ip: 172.17.91.27 # slot: 0 # demo: false # rack: 0 # offset: 2 #偏移量，当堆垛机站点列号=1时，偏移量=2 # port: 102 # crnOutStn[0]: #堆垛机出库站点 # staNo: 120 # row: 20 # bay: 1 # lev: 1 # devpPlcId: ${wcs-slave.devp[0].id} # crnInStn[0]: #堆垛机入库站点1 # staNo: 123 # row: 21 # bay: 1 # lev: 1 # backSta: 122 # devpPlcId: ${wcs-slave.devp[0].id} # crnOutStn[1]: #堆垛机出库站点 # staNo: 230 # row: 20 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # crnInStn[1]: #堆垛机入库站点2 # staNo: 235 # row: 21 # bay: 22 # lev: 2 # devpPlcId: ${wcs-slave.devp[1].id} # devp[0]: #输送线 # id: 1 # ip: 172.17.91.36 # rack: 0 # port: 102 # slot: 0 # emptyInSta[0]: #空板入库口0 # staNo: 103 # emptyInSta[1]: #空板入库口1 # staNo: 105 # emptyInSta[2]: #空板入库口2 # staNo: 109 # emptyInSta[3]: #空板入库口3 # staNo: 113 # emptyInSta[4]: #空板入库口4 # staNo: 117 # emptyInSta[5]: #空板入库口5 # staNo: 121 # inSta[0]: #入库口1 # #scale: ${wcs-slave.scale[0].id} # staNo: 103 # backSta: 102 # barcode: ${wcs-slave.barcode[0].id} # inSta[1]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 107 # backSta: 106 # barcode: ${wcs-slave.barcode[1].id} # #slot: 0 # inSta[2]: #入库口1 # #scale: ${wcs-slave.scale[0].id} # staNo: 111 # backSta: 110 # barcode: ${wcs-slave.barcode[2].id} # inSta[3]: #入库口1 # #scale: ${wcs-slave.scale[0].id} # staNo: 115 # backSta: 114 # barcode: ${wcs-slave.barcode[3].id} # inSta[4]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 119 # backSta: 118 # barcode: ${wcs-slave.barcode[4].id} # #slot: 0 # inSta[5]: #入库口1 # #scale: ${wcs-slave.scale[0].id} # staNo: 123 # backSta: 122 # barcode: ${wcs-slave.barcode[5].id} # outSta[0]: #出库口1 # staNo: 100 # outSta[1]: #出库口2 # staNo: 104 # outSta[2]: #出库口2 # staNo: 108 # outSta[3]: #出库口1 # staNo: 112 # outSta[4]: #出库口2 # staNo: 116 # outSta[5]: #出库口2 # staNo: 120 # devp[1]: #输送线 # id: 2 # ip: 172.17.91.45 # rack: 0 # port: 102 # slot: 0 # inSta[0]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 205 # backSta: 203 # #barcode: ${wcs-slave.barcode[4].id} # inSta[1]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 211 # backSta: 209 # #barcode: ${wcs-slave.barcode[4].id} # inSta[2]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 217 # backSta: 215 # #barcode: ${wcs-slave.barcode[4].id} # inSta[3]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 223 # backSta: 221 # #barcode: ${wcs-slave.barcode[4].id} # inSta[4]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 229 # backSta: 227 # #barcode: ${wcs-slave.barcode[4].id} # inSta[5]: #入库口2 # #scale: ${wcs-slave.scale[1].id} # staNo: 235 # backSta: 232 # #barcode: ${wcs-slave.barcode[4].id} # outSta[0]: #出库口1 # staNo: 200 # outSta[1]: #出库口1 # staNo: 206 # outSta[2]: #出库口1 # staNo: 212 # outSta[3]: #出库口1 # staNo: 218 # outSta[4]: #出库口1 # staNo: 224 # outSta[5]: #出库口1 # staNo: 230 # devp[2]: #输送线 # id: 3 # ip: 172.17.8.201 # rack: 0 # slot: 0 # port: 102 # emptyInSta[0]: #空板入库口1 # staNo: 306 # inSta[0]: #入库口1 # scale: ${wcs-slave.scale[1].id} # staNo: 301 # barcode: ${wcs-slave.barcode[6].id} # backSta: 300 # #slot: 0 # outSta[0]: #出库口1 # staNo: 307 ## devp[3]: #输送线 ## id: 4 ## ip: 10.10.10.30 ## rack: 0 ## slot: 0 ## port: 102 ## emptyInSta[0]: #空板入库口1 ## staNo: 406 ## inSta[0]: #入库口1 ## scale: ${wcs-slave.scale[1].id} ## staNo: 406 ## barcode: ${wcs-slave.barcode[1].id} ## #slot: 0 ## outSta[0]: #出库口1 ## staNo: 407 # scale[0]: #磅秤 # port: 5005 # ip: 10.10.10.201 # id: 1 # scale[1]: #磅秤 # port: 5005 # ip: 10.10.10.202 # id: 2 # barcode[0]: #条码扫描仪 # port: 51236 # ip: 172.17.91.39 # id: 1 # barcode[1]: # port: 51236 # ip: 172.17.91.40 # id: 2 # barcode[2]: # port: 51236 # ip: 172.17.91.41 # id: 3 # barcode[3]: # port: 51236 # ip: 172.17.91.42 # id: 4 # barcode[4]: # port: 51236 # ip: 172.17.91.43 # id: 5 # barcode[5]: # port: 51236 # ip: 172.17.91.44 # id: 6 # barcode[6]: # port: 51236 # ip: 172.17.8.203 # id: 7 src/main/resources/mapper/BasDevpMapper.xml
@@ -4,7 +4,7 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp"> <id column="DEC_NO" property="devNo" /> <id column="DEV_NO" property="devNo" /> <result column="DEC_DESC" property="decDesc" /> <result column="DEV_MK" property="devMk" /> <result column="IN_ENABLE" property="inEnable" />
