src/main/java/com/zy/asrs/entity/ApiConfig.java
@@ -27,32 +27,35 @@ private static final long serialVersionUID = 1L; @ApiModelProperty(value= "") @TableId(value = "id", type = IdType.AUTO) @TableId(value = "\"id\"", type = IdType.AUTO) private Long id; /** * api地址 */ @ApiModelProperty(value= "api地址") @TableField("\"url\"") private String url; /** * 状态 0: 正常 1: 禁用 */ @ApiModelProperty(value= "状态 0: 正常 1: 禁用 ") @TableField("\"status\"") private Integer status; /** * 备注 */ @ApiModelProperty(value= "备注") @TableField("\"memo\"") private String memo; /** * 创建时间 */ @ApiModelProperty(value= "创建时间") @TableField("create_time") @TableField("\"create_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -60,7 +63,7 @@ * 更新时间 */ @ApiModelProperty(value= "更新时间") @TableField("update_time") @TableField("\"update_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; @@ -68,14 +71,14 @@ * 添加人员 */ @ApiModelProperty(value= "添加人员") @TableField("create_by") @TableField("\"create_by\"") private Long createBy; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("update_by") @TableField("\"update_by\"") private Long updateBy; public ApiConfig() {} src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -24,81 +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\"") private String uuid; /** * 名称空间 */ @ApiModelProperty(value= "名称空间") @TableField("\"namespace\"") private String namespace; /** * 接口地址 */ @ApiModelProperty(value= "接口地址") @TableField("\"url\"") private String url; /** * 平台密钥 */ @ApiModelProperty(value= "平台密钥") @TableField("\"appkey\"") private String appkey; /** * 时间戳 */ @ApiModelProperty(value= "时间戳") @TableField("\"timestamp\"") private String timestamp; /** * 客户端IP */ @ApiModelProperty(value= "客户端IP") @TableField("client_ip") @TableField("\"clientIp\"") private String clientIp; /** * 请求内容 */ @ApiModelProperty(value= "请求内容") @TableField("\"request\"") private String request; /** * 响应内容 */ @ApiModelProperty(value= "响应内容") @TableField("\"response\"") private String response; /** * 异常内容 */ @ApiModelProperty(value= "异常内容") @TableField("\"err\"") private String err; /** * 结果 1: 成功 0: 失败 */ @ApiModelProperty(value= "结果 1: 成功 0: 失败 ") @TableField("\"result\"") private Integer result; /** * 状态 1: 正常 0: 禁用 */ @ApiModelProperty(value= "状态 1: 正常 0: 禁用 ") @TableField("\"status\"") private Integer status; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("create_time") @TableField("\"createTime\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -106,7 +116,7 @@ * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("update_time") @TableField("\"updateTime\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; @@ -114,6 +124,7 @@ * 备注 */ @ApiModelProperty(value= "备注") @TableField("\"memo\"") private String memo; public ApiLog() {} src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -23,43 +23,42 @@ * 异常代号 */ @ApiModelProperty(value= "异常代号") @TableId(value = "error_code", type = IdType.AUTO) @TableField("error_code") @TableId(value = "\"errorCode\"", 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/BasCrnOpt.java
@@ -23,110 +23,112 @@ * ID */ @ApiModelProperty(value= "ID") @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("crn_no") @TableField("\"crn_no\"") private Integer crnNo; /** * 下发时间 */ @ApiModelProperty(value= "下发时间") @TableField("send_time") @TableField("\"send_time\"") private Date sendTime; /** * 模式 */ @ApiModelProperty(value= "模式") @TableField("\"mode\"") private String mode; /** * 源排 */ @ApiModelProperty(value= "源排") @TableField("source_row") @TableField("\"source_row\"") private Integer sourceRow; /** * 源列 */ @ApiModelProperty(value= "源列") @TableField("source_bay") @TableField("\"source_bay\"") private Integer sourceBay; /** * 源层 */ @ApiModelProperty(value= "源层") @TableField("source_lev") @TableField("\"source_lev\"") private Integer sourceLev; /** * 源站 */ @ApiModelProperty(value= "源站") @TableField("source_sta") @TableField("\"source_sta\"") private Integer sourceSta; /** * 目标排 */ @ApiModelProperty(value= "目标排") @TableField("pos_row") @TableField("\"pos_row\"") private Integer posRow; /** * 目标列 */ @ApiModelProperty(value= "目标列") @TableField("pos_bay") @TableField("\"pos_bay\"") private Integer posBay; /** * 目标层 */ @ApiModelProperty(value= "目标层") @TableField("pos_lev") @TableField("\"pos_lev\"") private Integer posLev; /** * 目标站 */ @ApiModelProperty(value= "目标站") @TableField("pos_sta") @TableField("\"pos_sta\"") private Integer posSta; /** * 响应结果 1: 正常 0: 失败 */ @ApiModelProperty(value= "响应结果 1: 正常 0: 失败 ") @TableField("\"response\"") private Integer response; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("update_time") @TableField("\"updateTime\"") private Date updateTime; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("update_by") @TableField("\"updateBy\"") private Long updateBy; public BasCrnOpt() {} src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -23,43 +23,42 @@ * 工作代号 */ @ApiModelProperty(value= "状态代号") @TableId(value = "sts_no", type = IdType.INPUT) @TableField("sts_no") @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/BasCrnp.java
@@ -25,127 +25,126 @@ * 编号 */ @ApiModelProperty(value= "编号") @TableId(value = "crn_no", type = IdType.INPUT) @TableField("crn_no") @TableId(value = "CRN_NO", type = IdType.INPUT) private Integer crnNo; /** * 可入 */ @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("crn_sts") @TableField("\"crn_sts\"") private Integer crnSts; /** * 工作号 */ @ApiModelProperty(value= "工作号") @TableField("wrk_no") @TableField("\"wrk_no\"") private Integer wrkNo; /** * 异常码 */ @ApiModelProperty(value= "异常码") @TableField("crn_err") @TableField("\"crn_err\"") private Long crnErr; /** * 源库位 */ @ApiModelProperty(value= "源库位") @TableField("frm_locno") @TableField("\"frm_locno\"") private String frmLocno; /** * 源站 */ @ApiModelProperty(value= "源站") @TableField("frm_sta") @TableField("\"frm_sta\"") private Integer frmSta; /** * 目标站 */ @ApiModelProperty(value= "目标站") @TableField("to_sta") @TableField("\"to_sta\"") private Integer toSta; /** * 目标库位 */ @ApiModelProperty(value= "目标库位") @TableField("to_locno") @TableField("\"to_locno\"") private String toLocno; /** * 创建者 */ @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("modi_user") @TableField("\"modi_user\"") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("\"modi_time\"") private Date modiTime; @ApiModelProperty(value= "") @TableField("hp_mk") @TableField("\"hp_mk\"") private String hpMk; @ApiModelProperty(value= "") @TableField("retrieve_mk") @TableField("\"retrieve_mk\"") private String retrieveMk; @ApiModelProperty(value= "") @TableField("ctl_hp") @TableField("\"ctl_hp\"") private String ctlHp; @ApiModelProperty(value= "") @TableField("ctl_rest") @TableField("\"ctl_rest\"") private String ctlRest; @ApiModelProperty(value= "") @TableField("emp_in") @TableField("\"emp_in\"") private String empIn; @ApiModelProperty(value= "") @TableField("tank_qty") @TableField("\"tank_qty\"") private Integer tankQty; @ApiModelProperty(value= "") @TableField("tank_qty1") @TableField("\"tank_qty1\"") private Integer tankQty1; public BasCrnp() {} src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -25,72 +25,79 @@ * 编号 */ @ApiModelProperty(value= "编号") @TableId(value = "dev_no", type = IdType.INPUT) @TableField("dev_no") @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\"") private String autoing; /** * 有物 */ @ApiModelProperty(value= "有物") @TableField("\"loading\"") private String loading; /** * 能入 */ @ApiModelProperty(value= "能入") @TableField("\"canining\"") private String canining; /** * 能出 */ @ApiModelProperty(value= "能出") @TableField("\"canouting\"") private String canouting; @ApiModelProperty(value= "") @TableField("\"fronting\"") private String fronting; @ApiModelProperty(value= "") @TableField("\"rearing\"") private String rearing; @ApiModelProperty(value= "") @TableField("\"uping\"") private String uping; @ApiModelProperty(value= "") @TableField("\"downing\"") private String downing; /** src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -23,149 +23,154 @@ * ID */ @ApiModelProperty(value= "ID") @TableId(value = "id", type = IdType.AUTO) @TableId(value = "\"id\"", type = IdType.AUTO) private Long id; /** * 编号 */ @ApiModelProperty(value= "编号") @TableField("\"uuid\"") private String uuid; /** * 工作号 */ @ApiModelProperty(value= "工作号") @TableField("wrk_no") @TableField("\"wrk_no\"") private Integer wrkNo; /** * 发生时间 */ @ApiModelProperty(value= "发生时间") @TableField("start_time") @TableField("\"start_time\"") private Date startTime; /** * 结束时间 */ @ApiModelProperty(value= "结束时间") @TableField("end_time") @TableField("\"end_time\"") private Date endTime; /** * 工作状态 */ @ApiModelProperty(value= "工作状态") @TableField("wrk_sts") @TableField("\"wrk_sts\"") private Long wrkSts; /** * 入出库类型 */ @ApiModelProperty(value= "入出库类型") @TableField("io_type") @TableField("\"io_type\"") private Integer ioType; /** * 堆垛机 */ @ApiModelProperty(value= "堆垛机") @TableField("crn_no") @TableField("\"crn_no\"") private Integer crnNo; /** * 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("\"error\"") private String error; /** * 异常情况 1: 未处理 2: 已修复 */ @ApiModelProperty(value= "异常情况 1: 未处理 2: 已修复 ") @TableField("\"status\"") private Integer status; /** * 添加时间 */ @ApiModelProperty(value= "添加时间") @TableField("create_time") @TableField("\"create_time\"") private Date createTime; /** * 添加人员 */ @ApiModelProperty(value= "添加人员") @TableField("create_by") @TableField("\"create_by\"") private Long createBy; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("update_time") @TableField("\"update_time\"") private Date updateTime; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("update_by") @TableField("\"update_by\"") private Long updateBy; /** * 备注 */ @ApiModelProperty(value= "备注") @TableField("\"memo\"") private String memo; public BasErrLog() {} src/main/java/com/zy/asrs/entity/DeviceError.java
@@ -19,27 +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\"") 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; src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -43,35 +43,36 @@ * wms任务号 */ @ApiModelProperty(value= "wms任务号") @TableId(value = "task_no", type = IdType.INPUT) @TableField("task_no") @TableId(value = "\"task_no\"", type = IdType.INPUT) @TableField("\"task_no\"") private String taskNo; /** * 任务状态 1: 接收 2: 派发 3: 完结 4: 取消 */ @ApiModelProperty(value= "任务状态 1: 接收 2: 派发 5: 完结 4: 取消 ") @TableField("\"status\"") private Integer status; /** * 任务号 */ @ApiModelProperty(value= "任务号") @TableField("wrk_no") @TableField("\"wrk_no\"") private Integer wrkNo; /** * 任务号 */ @ApiModelProperty(value= "重量") @TableField("sc_weight") @TableField("\"sc_weight\"") private Integer scWeight; /** * 任务时间(接收时间) */ @ApiModelProperty(value= "任务时间(接收时间)") @TableField("create_time") @TableField("\"create_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; @@ -79,42 +80,42 @@ * 任务类型 */ @ApiModelProperty(value= "任务类型") @TableField("io_type") @TableField("\"io_type\"") private Integer ioType; /** * 优先级 */ @ApiModelProperty(value= "优先级") @TableField("io_pri") @TableField("\"io_pri\"") private Integer ioPri; /** * 起点 */ @ApiModelProperty(value= "起点") @TableField("start_point") @TableField("\"start_point\"") private String startPoint; /** * 终点 */ @ApiModelProperty(value= "终点") @TableField("target_point") @TableField("\"target_point\"") private String targetPoint; /** * 修改人员 */ @ApiModelProperty(value= "修改人员") @TableField("modi_user") @TableField("\"modi_user\"") private Long modiUser; /** * 修改时间 */ @ApiModelProperty(value= "修改时间") @TableField("modi_time") @TableField("\"modi_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date modiTime; @@ -122,19 +123,21 @@ * 备注 */ @ApiModelProperty(value= "备注") @TableField("\"memo\"") private String memo; /** * 条码 */ @ApiModelProperty(value= "条码") @TableField("\"barcode\"") private String barcode; /** * 派发时间 */ @ApiModelProperty(value= "派发时间") @TableField("assign_time") @TableField("\"assign_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date assignTime; @@ -142,7 +145,7 @@ * 执行时间 */ @ApiModelProperty(value= "执行时间") @TableField("execute_time") @TableField("\"execute_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date executeTime; @@ -150,7 +153,7 @@ * 完结时间 */ @ApiModelProperty(value= "完结时间") @TableField("complete_time") @TableField("\"complete_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date completeTime; @@ -158,7 +161,7 @@ * 取消时间 */ @ApiModelProperty(value= "取消时间") @TableField("cancel_time") @TableField("\"cancel_time\"") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date cancelTime; @@ -166,26 +169,26 @@ * 工作状态 */ @ApiModelProperty(value= "工作状态") @TableField("wrk_sts") @TableField("\"wrk_sts\"") private Integer wrkSts; /** * 堆垛机号 */ @ApiModelProperty(value= "堆垛机号") @TableField("crn_no") @TableField("\"crn_no\"") private Integer crnNo; @ApiModelProperty(value = "移库标记") @TableField("transfer_mark") @TableField("\"transfer_mark\"") private Integer transferMark; @ApiModelProperty(value = "原始起点") @TableField("origin_start_point") @TableField("\"origin_start_point\"") private String originStartPoint; @ApiModelProperty(value = "原始起点") @TableField("origin_target_point") @TableField("\"origin_target_point\"") private String originTargetPoint; public TaskWrk() {} src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -749,10 +749,10 @@ for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) { // 获取工作状态为11(生成出库ID)的移库工作档 List<TaskWrk> taskWrks = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>() .eq("crn_no",slave.getId()) .eq("wrk_sts",11) .eq("io_type",3) .orderBy("io_pri",false)); .eq("\"crn_no\"",slave.getId()) .eq("\"wrk_sts\"",11) .eq("\"io_type\"",3) .orderBy("\"io_pri\"",false)); for (TaskWrk taskWrk : taskWrks){ // 双深库位且浅库位有货,则需先对浅库位进行库位移转 src/main/resources/application.yml
@@ -41,7 +41,7 @@ #License相关配置 license: subject: ryzhwcs subject: shzhjxydwcs publicAlias: publicCert storePass: public_zhongyang_123456789 licensePath: license.lic src/main/resources/mapper/ApiConfigMapper.xml
@@ -4,21 +4,21 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ApiConfig"> <id column="id" property="id" /> <result column="url" property="url" /> <result column="status" property="status" /> <result column="memo" property="memo" /> <result column="create_time" property="createTime" /> <result column="update_time" property="updateTime" /> <result column="create_by" property="createBy" /> <result column="update_by" property="updateBy" /> <id column="ID" property="id" /> <result column="URL" property="url" /> <result column="STATUS" property="status" /> <result column="MEMO" property="memo" /> <result column="CREATE_TIME" property="createTime" /> <result column="UPDATE_TIME" property="updateTime" /> <result column="CREATE_BY" property="createBy" /> <result column="UPDATE_BY" property="updateBy" /> </resultMap> <select id="selectByUrl" resultMap="BaseResultMap"> select top 1 * from "SOURCE"."wcs_api_config" where "url" = #{url} order by "create_time" desc where "URL" = #{url} order by "CREATE_TIME" desc </select> </mapper> src/main/resources/mapper/ApiLogMapper.xml
@@ -4,21 +4,21 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ApiLog"> <id column="id" property="id" /> <result column="uuid" property="uuid" /> <result column="namespace" property="namespace" /> <result column="url" property="url" /> <result column="appkey" property="appkey" /> <result column="timestamp" property="timestamp" /> <result column="client_ip" property="clientIp" /> <result column="request" property="request" /> <result column="response" property="response" /> <result column="err" property="err" /> <result column="result" property="result" /> <result column="status" property="status" /> <result column="create_time" property="createTime" /> <result column="update_time" property="updateTime" /> <result column="memo" property="memo" /> <id column="ID" property="id" /> <result column="UUID" property="uuid" /> <result column="NAMESPACE" property="namespace" /> <result column="URL" property="url" /> <result column="APPKEY" property="appkey" /> <result column="TIMESTAMP" property="timestamp" /> <result column="CLIENT_IP" property="clientIp" /> <result column="REQUEST" property="request" /> <result column="RESPONSE" property="response" /> <result column="ERR" property="err" /> <result column="RESULT" property="result" /> <result column="STATUS" property="status" /> <result column="CREATE_TIME" property="createTime" /> <result column="UPDATE_TIME" property="updateTime" /> <result column="MEMO" property="memo" /> </resultMap> src/main/resources/mapper/BasCrnErrorMapper.xml
@@ -4,12 +4,12 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnError"> <id column="error_code" property="errorCode" /> <result column="err_name" property="errName" /> <result column="modi_user" property="modiUser" /> <result column="modi_time" property="modiTime" /> <result column="appe_user" property="appeUser" /> <result column="appe_time" property="appeTime" /> <id column="ERROR_CODE" property="errorCode" /> <result column="ERR_NAME" property="errName" /> <result column="MODI_USER" property="modiUser" /> <result column="MODI_TIME" property="modiTime" /> <result column="APPE_USER" property="appeUser" /> <result column="APPE_TIME" property="appeTime" /> </resultMap> src/main/resources/mapper/BasCrnStatusMapper.xml
@@ -4,12 +4,12 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnStatus"> <id column="sts_no" property="stsNo" /> <result column="sts_desc" property="stsDesc" /> <result column="modi_user" property="modiUser" /> <result column="modi_time" property="modiTime" /> <result column="appe_user" property="appeUser" /> <result column="appe_time" property="appeTime" /> <id column="STS_NO" property="stsNo" /> <result column="STS_DESC" property="stsDesc" /> <result column="MODI_USER" property="modiUser" /> <result column="MODI_TIME" property="modiTime" /> <result column="APPE_USER" property="appeUser" /> <result column="APPE_TIME" property="appeTime" /> </resultMap> src/main/resources/mapper/BasCrnpMapper.xml
@@ -4,27 +4,27 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCrnp"> <id column="crn_no" property="crnNo" /> <result column="in_enable" property="inEnable" /> <result column="out_enable" property="outEnable" /> <result column="crn_sts" property="crnSts" /> <result column="wrk_no" property="wrkNo" /> <result column="crn_err" property="crnErr" /> <result column="frm_locno" property="frmLocno" /> <result column="frm_sta" property="frmSta" /> <result column="to_sta" property="toSta" /> <result column="to_locno" property="toLocno" /> <result column="appe_user" property="appeUser" /> <result column="appe_time" property="appeTime" /> <result column="modi_user" property="modiUser" /> <result column="modi_time" property="modiTime" /> <result column="hp_mk" property="hpMk" /> <result column="retrieve_mk" property="retrieveMk" /> <result column="ctl_hp" property="ctlHp" /> <result column="ctl_rest" property="ctlRest" /> <result column="emp_in" property="empIn" /> <result column="tank_qty" property="tankQty" /> <result column="tank_qty1" property="tankQty1" /> <id column="CRN_NO" property="crnNo" /> <result column="IN_ENABLE" property="inEnable" /> <result column="OUT_ENABLE" property="outEnable" /> <result column="CRN_STS" property="crnSts" /> <result column="WRK_NO" property="wrkNo" /> <result column="CRN_ERR" property="crnErr" /> <result column="FRM_LOCNO" property="frmLocno" /> <result column="FRM_STA" property="frmSta" /> <result column="TO_STA" property="toSta" /> <result column="TO_LOCNO" property="toLocno" /> <result column="APPE_USER" property="appeUser" /> <result column="APPE_TIME" property="appeTime" /> <result column="MODI_USER" property="modiUser" /> <result column="MODI_TIME" property="modiTime" /> <result column="HP_MK" property="hpMk" /> <result column="RETRIEVE_MK" property="retrieveMk" /> <result column="CTL_HP" property="ctlHp" /> <result column="CTL_REST" property="ctlRest" /> <result column="EMP_IN" property="empIn" /> <result column="TANK_QTY" property="tankQty" /> <result column="TANK_QTY1" property="tankQty1" /> </resultMap> src/main/resources/mapper/BasDevpMapper.xml
@@ -4,44 +4,44 @@ <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevp"> <id column="dev_no" property="devNo" /> <result column="dec_desc" property="decDesc" /> <result column="dev_mk" property="devMk" /> <result column="in_enable" property="inEnable" /> <result column="out_enable" property="outEnable" /> <result column="autoing" property="autoing" /> <result column="loading" property="loading" /> <result column="canining" property="canining" /> <result column="canouting" property="canouting" /> <result column="fronting" property="fronting" /> <result column="rearing" property="rearing" /> <result column="uping" property="uping" /> <result column="downing" property="downing" /> <result column="inreq1" property="inreq1" /> <result column="inreq2" property="inreq2" /> <result column="wrk_no" property="wrkNo" /> <result column="wrk_no1" property="wrkNo1" /> <result column="ctn_type" property="ctnType" /> <result column="barcode" property="barcode" /> <result column="in_qty" property="inQty" /> <result column="row1" property="row1" /> <result column="io_time" property="ioTime" /> <result column="area" property="area" /> <result column="in_ok" property="inOk" /> <result column="out_ok" property="outOk" /> <result column="loc_type1" property="locType1" /> <result column="loc_type2" property="locType2" /> <result column="loc_type3" property="locType3" /> <result column="modi_user" property="modiUser" /> <result column="modi_time" property="modiTime" /> <result column="appe_user" property="appeUser" /> <result column="appe_time" property="appeTime" /> <result column="std_qty" property="stdQty" /> <result column="min_wt" property="minWt" /> <result column="max_wt" property="maxWt" /> <result column="gross_wt" property="grossWt" /> <result column="cart_pos" property="cartPos" /> <result column="sta_err" property="staErr" /> <id column="DEC_NO" property="devNo" /> <result column="DEC_DESC" property="decDesc" /> <result column="DEV_MK" property="devMk" /> <result column="IN_ENABLE" property="inEnable" /> <result column="OUT_ENABLE" property="outEnable" /> <result column="AUTOING" property="autoing" /> <result column="LOADING" property="loading" /> <result column="CANINING" property="canining" /> <result column="CANOUTING" property="canouting" /> <result column="FRONTING" property="fronting" /> <result column="REARING" property="rearing" /> <result column="UPING" property="uping" /> <result column="DOWNING" property="downing" /> <result column="INREQ1" property="inreq1" /> <result column="INREQ2" property="inreq2" /> <result column="WRK_NO" property="wrkNo" /> <result column="WRK_NO1" property="wrkNo1" /> <result column="CTN_TYPE" property="ctnType" /> <result column="BARCODE" property="barcode" /> <result column="IN_QTY" property="inQty" /> <result column="ROW1" property="row1" /> <result column="IO_TIME" property="ioTime" /> <result column="AREA" property="area" /> <result column="IN_OK" property="inOk" /> <result column="OUT_OK" property="outOk" /> <result column="LOC_TYPE1" property="locType1" /> <result column="LOC_TYPE2" property="locType2" /> <result column="LOC_TYPE3" property="locType3" /> <result column="MODI_USER" property="modiUser" /> <result column="MODI_TIME" property="modiTime" /> <result column="APPE_USER" property="appeUser" /> <result column="APPE_TIME" property="appeTime" /> <result column="STD_QTY" property="stdQty" /> <result column="MIN_WT" property="minWt" /> <result column="MAX-WT" property="maxWt" /> <result column="GROSS_WT" property="grossWt" /> <result column="CART_POS" property="cartPos" /> <result column="STA_ERR" property="staErr" /> </resultMap>