*
lsh
2025-04-02 acc6d0cdd8c4a587c4ae4f608e25c8903171fa6b
*
12个文件已修改
224 ■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/BasCrnp.java 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasLocStsMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasPlcerrorLogMapper.xml 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasPlcerrorMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasWrkIotypeMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasWrkStatusMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/CommandInfoLogMapper.xml 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/CommandInfoMapper.xml 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ConfigMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DataResourceMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/DeviceErrorMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/HostMapper.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -32,119 +32,119 @@
     * 可入
     */
    @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/resources/mapper/BasLocStsMapper.xml
@@ -4,12 +4,12 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLocSts">
        <id column="loc_sts" property="locSts" />
        <result column="loc_desc" property="locDesc" />
        <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="LOC_STS" property="locSts" />
        <result column="LOC_DESC" property="locDesc" />
        <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/BasPlcerrorLogMapper.xml
@@ -4,26 +4,26 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerrorLog">
        <id column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="wrk_sts" property="wrkSts" />
        <result column="io_type" property="ioType" />
        <result column="plc_no" property="plcNo" />
        <result column="loc_no" property="locNo" />
        <result column="sta_no" property="staNo" />
        <result column="source_sta_no" property="sourceStaNo" />
        <result column="source_loc_no" property="sourceLocNo" />
        <result column="barcode" property="barcode" />
        <result column="err_code" property="errCode" />
        <result column="err" property="err" />
        <id column="ID" property="id" />
        <result column="WRK_NO" property="wrkNo" />
        <result column="START_TIME" property="startTime" />
        <result column="END_TIME" property="endTime" />
        <result column="WRK_STS" property="wrkSts" />
        <result column="IO_TYPE" property="ioType" />
        <result column="PLC_NO" property="plcNo" />
        <result column="LOC_NO" property="locNo" />
        <result column="STA_NO" property="staNo" />
        <result column="SOURCE_STA_NO" property="sourceStaNo" />
        <result column="SOURCE_LOC_NO" property="sourceLocNo" />
        <result column="BARCODE" property="barcode" />
        <result column="ERR_CODE" property="errCode" />
        <result column="ERR" property="err" />
        <result column="status" property="status" />
        <result column="create_time" property="createTime" />
        <result column="create_by" property="createBy" />
        <result column="update_time" property="updateTime" />
        <result column="update_by" property="updateBy" />
        <result column="memo" property="memo" />
        <result column="CREATE_TIME" property="createTime" />
        <result column="CREATE_BY" property="createBy" />
        <result column="UPDATE_TIME" property="updateTime" />
        <result column="UPDATE_BY" property="updateBy" />
        <result column="MEMO" property="memo" />
    </resultMap>
src/main/resources/mapper/BasPlcerrorMapper.xml
@@ -4,12 +4,12 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasPlcerror">
        <result column="error_code" property="errorCode" />
        <result column="error_desc" property="errorDesc" />
        <result column="modi_time" property="modiTime" />
        <result column="modi_user" property="modiUser" />
        <result column="appe_time" property="appeTime" />
        <result column="appe_user" property="appeUser" />
        <result column="ERROR_CODE" property="errorCode" />
        <result column="ERROR_DESC" property="errorDesc" />
        <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/BasWrkIotypeMapper.xml
@@ -4,13 +4,13 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkIotype">
        <id column="io_type" property="ioType" />
        <result column="io_pri" property="ioPri" />
        <result column="io_desc" property="ioDesc" />
        <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="IO_TYPE" property="ioType" />
        <result column="IO_PRI" property="ioPri" />
        <result column="IO_DESC" property="ioDesc" />
        <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/BasWrkStatusMapper.xml
@@ -4,12 +4,12 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWrkStatus">
        <id column="wrk_sts" property="wrkSts" />
        <result column="wrk_desc" property="wrkDesc" />
        <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="WRK_STS" property="wrkSts" />
        <result column="WRK_DESC" property="wrkDesc" />
        <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/CommandInfoLogMapper.xml
@@ -4,20 +4,20 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfoLog">
        <id column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="start_pos" property="startPos" />
        <result column="end_pos" property="endPos" />
        <result column="command_status" property="commandStatus" />
        <result column="start_time" property="startTime" />
        <result column="command_type" property="commandType" />
        <result column="device" property="device" />
        <result column="device_log" property="deviceLog" />
        <result column="command_desc" property="commandDesc" />
        <result column="command" property="command" />
        <result column="task_no" property="taskNo" />
        <result column="execute_time" property="executeTime" />
        <result column="complete_time" property="completeTime" />
        <id column="ID" property="id" />
        <result column="WRK_NO" property="wrkNo" />
        <result column="START_POS" property="startPos" />
        <result column="END_POS" property="endPos" />
        <result column="COMMAND_STATUS" property="commandStatus" />
        <result column="START_TIME" property="startTime" />
        <result column="COMMAND_TYPE" property="commandType" />
        <result column="DEVICE" property="device" />
        <result column="DEVICE_LOG" property="deviceLog" />
        <result column="COMMAND_DESC" property="commandDesc" />
        <result column="COMMAND" property="command" />
        <result column="TASK_NO" property="taskNo" />
        <result column="EXECUTE_TIME" property="executeTime" />
        <result column="COMPLETE_TIME" property="completeTime" />
    </resultMap>
src/main/resources/mapper/CommandInfoMapper.xml
@@ -4,17 +4,17 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfo">
        <id column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="task_no" property="taskNo" />
        <result column="command_status" property="commandStatus" />
        <result column="start_time" property="startTime" />
        <result column="command_type" property="commandType" />
        <result column="device" property="device" />
        <result column="device_log" property="deviceLog" />
        <result column="command_desc" property="commandDesc" />
        <result column="execute_time" property="executeTime" />
        <result column="complete_time" property="completeTime" />
        <id column="ID" property="id" />
        <result column="WRK_NO" property="wrkNo" />
        <result column="TASK_NO" property="taskNo" />
        <result column="COMMAND_STATUS" property="commandStatus" />
        <result column="START_TIME" property="startTime" />
        <result column="COMMAND_TYPE" property="commandType" />
        <result column="DEVICE" property="device" />
        <result column="DEVICE_LOG" property="deviceLog" />
        <result column="COMMAND_DESC" property="commandDesc" />
        <result column="EXECUTE_TIME" property="executeTime" />
        <result column="COMPLETE_TIME" property="completeTime" />
    </resultMap>
src/main/resources/mapper/ConfigMapper.xml
@@ -4,12 +4,12 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.Config">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="code" property="code" />
        <result column="value" property="value" />
        <result column="type" property="type" />
        <result column="status" property="status" />
        <id column="ID" property="id" />
        <result column="NAME" property="name" />
        <result column="CODE" property="code" />
        <result column="VALUE" property="value" />
        <result column="TYPE" property="type" />
        <result column="STATUS" property="status" />
    </resultMap>
src/main/resources/mapper/DataResourceMapper.xml
@@ -4,12 +4,12 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DataResource">
        <id column="id" property="id" />
        <result column="data" property="data" />
        <result column="name" property="name" />
        <result column="resource_id" property="resourceId" />
        <result column="create_time" property="createTime" />
        <result column="memo" property="memo" />
        <id column="ID" property="id" />
        <result column="DATA" property="data" />
        <result column="NAME" property="name" />
        <result column="RESOURCE_ID" property="resourceId" />
        <result column="CREATE_TIME" property="createTime" />
        <result column="MEMO" property="memo" />
    </resultMap>
src/main/resources/mapper/DeviceErrorMapper.xml
@@ -4,11 +4,11 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DeviceError">
        <id column="id" property="id" />
        <result column="device" property="device" />
        <result column="device_id" property="deviceId" />
        <result column="create_time" property="createTime" />
        <result column="msg" property="msg" />
        <id column="ID" property="id" />
        <result column="DEVICE" property="device" />
        <result column="DEVICE_ID" property="deviceId" />
        <result column="CREATE_TIME" property="createTime" />
        <result column="MSG" property="msg" />
    </resultMap>
src/main/resources/mapper/HostMapper.xml
@@ -4,12 +4,12 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.Host">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="flag" property="flag" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="status" property="status" />
        <id column="ID" property="id" />
        <result column="NAME" property="name" />
        <result column="FLAG" property="flag" />
        <result column="CREATE_TIME" property="createTime" />
        <result column="UPDATE_TIME" property="updateTime" />
        <result column="STATUS" property="status" />
    </resultMap>