*
lsh
2025-04-02 3e6c31a618506106daad3934b5b4988dcf553918
*
16个文件已修改
406 ■■■■ 已修改文件
src/main/resources/mapper/ApiConfigMapper.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasPlcerrorLogMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocDetlMapper.xml 78 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocMastMapper.xml 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/MatCodeMapper.xml 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/OperateLogMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/PermissionMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ResourceMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/RoleMapper.xml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/RolePermissionMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/RoleResourceMapper.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/RowLastnoMapper.xml 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/StaDescMapper.xml 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserLoginMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/UserMapper.xml 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/WaitPakinMapper.xml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ApiConfigMapper.xml
@@ -4,14 +4,14 @@
    <!-- 通用查询映射结果 -->
    <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>
src/main/resources/mapper/BasPlcerrorLogMapper.xml
@@ -18,7 +18,7 @@
        <result column="BARCODE" property="barcode" />
        <result column="ERR_CODE" property="errCode" />
        <result column="ERR" property="err" />
        <result column="status" property="status" />
        <result column="STATUS" property="status" />
        <result column="CREATE_TIME" property="createTime" />
        <result column="CREATE_BY" property="createBy" />
        <result column="UPDATE_TIME" property="updateTime" />
src/main/resources/mapper/LocDetlMapper.xml
@@ -4,51 +4,51 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
        <result column="loc_no" property="locNo" />
        <result column="zpallet" property="zpallet" />
        <result column="anfme" property="anfme" />
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="batch" property="batch" />
        <result column="order_no" property="orderNo" />
        <result column="LOC_NO" property="locNo" />
        <result column="ZPALLET" property="zpallet" />
        <result column="ANFME" property="anfme" />
        <result column="MATNR" property="matnr" />
        <result column="MAKTX" property="maktx" />
        <result column="BATCH" property="batch" />
        <result column="ORDER_NO" property="orderNo" />
        <result column="specs" property="specs" />
        <result column="model" property="model" />
        <result column="color" property="color" />
        <result column="brand" property="brand" />
        <result column="unit" property="unit" />
        <result column="price" property="price" />
        <result column="sku" property="sku" />
        <result column="units" property="units" />
        <result column="barcode" property="barcode" />
        <result column="origin" property="origin" />
        <result column="manu" property="manu" />
        <result column="manu_date" property="manuDate" />
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />
        <result column="supp_code" property="suppCode" />
        <result column="be_batch" property="beBatch" />
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />
        <result column="SPECS" property="specs" />
        <result column="MODEL" property="model" />
        <result column="COLOR" property="color" />
        <result column="BRAND" property="brand" />
        <result column="UNIT" property="unit" />
        <result column="PRICE" property="price" />
        <result column="SKU" property="sku" />
        <result column="UNITS" property="units" />
        <result column="BARCODE" property="barcode" />
        <result column="ORIGIN" property="origin" />
        <result column="MANU" property="manu" />
        <result column="MANU_DATE" property="manuDate" />
        <result column="ITEM_NUM" property="itemNum" />
        <result column="SAFE_QTY" property="safeQty" />
        <result column="WEIGHT" property="weight" />
        <result column="LENGTH" property="length" />
        <result column="VOLUME" property="volume" />
        <result column="THREE_CODE" property="threeCode" />
        <result column="SUPP" property="supp" />
        <result column="SUPP_CODE" property="suppCode" />
        <result column="BE_BATCH" property="beBatch" />
        <result column="DEAD_TIME" property="deadTime" />
        <result column="DEAD_WARN" property="deadWarn" />
        <result column="SOURCE" property="source" />
        <result column="INSPECT" property="inspect" />
        <result column="DANGER" property="danger" />
        <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="memo" property="memo" />
        <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="MEMO" property="memo" />
    </resultMap>
    <sql id="stockOutCondition">
        <if test="loc_no!=null and loc_no!='' ">
            and a."loc_no" like '%' + #{loc_no} + '%'
            and a."LOC_NO" like '%' + #{loc_no} + '%'
        </if>
        <if test="matNo!=null and matNo!='' ">
            and a."matnr" like '%' + #{matNo} + '%'
src/main/resources/mapper/LocMastMapper.xml
@@ -4,37 +4,37 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocMast">
        <id column="loc_no" property="locNo" />
        <result column="whs_type" property="whsType" />
        <result column="plt_type" property="pltType" />
        <result column="ctn_type" property="ctnType" />
        <result column="loc_sts" property="locSts" />
        <result column="sheet_no" property="sheetNo" />
        <result column="crn_no" property="crnNo" />
        <result column="row1" property="row1" />
        <result column="bay1" property="bay1" />
        <result column="lev1" property="lev1" />
        <result column="full_plt" property="fullPlt" />
        <result column="loc_type" property="locType" />
        <result column="loc_type1" property="locType1" />
        <result column="loc_type2" property="locType2" />
        <result column="loc_type3" property="locType3" />
        <result column="out_enable" property="outEnable" />
        <result column="io_time" property="ioTime" />
        <result column="first_time" property="firstTime" />
        <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="error_time" property="errorTime" />
        <result column="error_memo" property="errorMemo" />
        <result column="ctn_kind" property="ctnKind" />
        <result column="sc_weight" property="scWeight" />
        <result column="inv_wh" property="invWh" />
        <result column="mk" property="mk" />
        <result column="barcode" property="barcode" />
        <result column="ctn_no" property="ctnNo" />
        <result column="status" property="status" />
        <id column="LOC_NO" property="locNo" />
        <result column="WHS_TYPE" property="whsType" />
        <result column="PLT_TYPE" property="pltType" />
        <result column="CTN_TYPE" property="ctnType" />
        <result column="LOC_STS" property="locSts" />
        <result column="SHEET_NO" property="sheetNo" />
        <result column="CRN_NO" property="crnNo" />
        <result column="ROW1" property="row1" />
        <result column="BAY1" property="bay1" />
        <result column="LEV1" property="lev1" />
        <result column="FULL_PLT" property="fullPlt" />
        <result column="LOC_TYPE" property="locType" />
        <result column="LOC_TYPE1" property="locType1" />
        <result column="LOC_TYPE2" property="locType2" />
        <result column="LOC_TYPE3" property="locType3" />
        <result column="OUT_ENABLE" property="outEnable" />
        <result column="IO_TIME" property="ioTime" />
        <result column="FIRST_TIME" property="firstTime" />
        <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="ERROR_TIME" property="errorTime" />
        <result column="ERROR_MEMO" property="errorMemo" />
        <result column="CTN_KIND" property="ctnKind" />
        <result column="SC_WEIGHT" property="scWeight" />
        <result column="INV_WH" property="invWh" />
        <result column="MK" property="mk" />
        <result column="BARCODE" property="barcode" />
        <result column="CTN_NO" property="ctnNo" />
        <result column="STATUS" property="status" />
    </resultMap>
src/main/resources/mapper/MatCodeMapper.xml
@@ -4,44 +4,44 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.MatCode">
        <result column="mat_no" property="matNo" />
        <result column="barcode" property="barcode" />
        <result column="mat_name" property="matName" />
        <result column="str1" property="str1" />
        <result column="str2" property="str2" />
        <result column="str3" property="str3" />
        <result column="str4" property="str4" />
        <result column="str5" property="str5" />
        <result column="str6" property="str6" />
        <result column="str7" property="str7" />
        <result column="str8" property="str8" />
        <result column="str9" property="str9" />
        <result column="str10" property="str10" />
        <result column="str11" property="str11" />
        <result column="str12" property="str12" />
        <result column="str13" property="str13" />
        <result column="str14" property="str14" />
        <result column="str15" property="str15" />
        <result column="str16" property="str16" />
        <result column="str17" property="str17" />
        <result column="str18" property="str18" />
        <result column="str19" property="str19" />
        <result column="str20" property="str20" />
        <result column="str21" property="str21" />
        <result column="str22" property="str22" />
        <result column="str23" property="str23" />
        <result column="num1" property="num1" />
        <result column="num2" property="num2" />
        <result column="num3" property="num3" />
        <result column="num4" property="num4" />
        <result column="num5" property="num5" />
        <result column="num6" property="num6" />
        <result column="date1" property="date1" />
        <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="status" property="status" />
        <result column="MAT_NO" property="matNo" />
        <result column="BARCODE" property="barcode" />
        <result column="MAT_NAME" property="matName" />
        <result column="STR1" property="str1" />
        <result column="STR2" property="str2" />
        <result column="STR3" property="str3" />
        <result column="STR4" property="str4" />
        <result column="STR5" property="str5" />
        <result column="STR6" property="str6" />
        <result column="STR7" property="str7" />
        <result column="STR8" property="str8" />
        <result column="STR9" property="str9" />
        <result column="STR10" property="str10" />
        <result column="STR11" property="str11" />
        <result column="STR12" property="str12" />
        <result column="STR13" property="str13" />
        <result column="STR14" property="str14" />
        <result column="STR15" property="str15" />
        <result column="STR16" property="str16" />
        <result column="STR17" property="str17" />
        <result column="STR18" property="str18" />
        <result column="STR19" property="str19" />
        <result column="STR20" property="str20" />
        <result column="STR21" property="str21" />
        <result column="STR22" property="str22" />
        <result column="STR23" property="str23" />
        <result column="NUM1" property="num1" />
        <result column="NUM2" property="num2" />
        <result column="NUM3" property="num3" />
        <result column="NUM4" property="num4" />
        <result column="NUM5" property="num5" />
        <result column="NUM6" property="num6" />
        <result column="DATE1" property="date1" />
        <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="STATUS" property="status" />
    </resultMap>
src/main/resources/mapper/OperateLogMapper.xml
@@ -4,13 +4,13 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.OperateLog">
        <id column="id" property="id" />
        <result column="action" property="action" />
        <result column="user_id" property="userId" />
        <result column="ip" property="ip" />
        <result column="request" property="request" />
        <result column="response" property="response" />
        <result column="create_time" property="createTime" />
        <id column="ID" property="id" />
        <result column="ACTION" property="action" />
        <result column="USER_ID" property="userId" />
        <result column="IP" property="ip" />
        <result column="REQUEST" property="request" />
        <result column="RESPONSE" property="response" />
        <result column="CREATE_TIME" property="createTime" />
    </resultMap>
src/main/resources/mapper/PermissionMapper.xml
@@ -4,11 +4,11 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.Permission">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="action" property="action" />
        <result column="resource_id" property="resourceId" />
        <result column="status" property="status" />
        <id column="ID" property="id" />
        <result column="NAME" property="name" />
        <result column="ACTION" property="action" />
        <result column="RESOURCE_ID" property="resourceId" />
        <result column="STATUS" property="status" />
    </resultMap>
src/main/resources/mapper/ResourceMapper.xml
@@ -4,13 +4,13 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.Resource">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="name" property="name" />
        <result column="resource_id" property="resourceId" />
        <result column="level" property="level" />
        <result column="sort" property="sort" />
        <result column="status" property="status" />
        <id column="ID" property="id" />
        <result column="CODE" property="code" />
        <result column="NAME" property="name" />
        <result column="RESOURCE_ID" property="resourceId" />
        <result column="LEVEL" property="level" />
        <result column="SORT" property="sort" />
        <result column="STATUS" property="status" />
    </resultMap>
src/main/resources/mapper/RoleMapper.xml
@@ -4,11 +4,11 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.Role">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="name" property="name" />
        <result column="leader" property="leader" />
        <result column="level" property="level" />
        <id column="ID" property="id" />
        <result column="CODE" property="code" />
        <result column="NAME" property="name" />
        <result column="LEADER" property="leader" />
        <result column="LEVEL" property="level" />
    </resultMap>
src/main/resources/mapper/RolePermissionMapper.xml
@@ -4,9 +4,9 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.RolePermission">
        <id column="id" property="id" />
        <result column="role_id" property="roleId" />
        <result column="permission_id" property="permissionId" />
        <id column="ID" property="id" />
        <result column="ROLE_ID" property="roleId" />
        <result column="PERMISSION_ID" property="permissionId" />
    </resultMap>
src/main/resources/mapper/RoleResourceMapper.xml
@@ -4,9 +4,9 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.RoleResource">
        <id column="id" property="id" />
        <result column="role_id" property="roleId" />
        <result column="resource_id" property="resourceId" />
        <id column="ID" property="id" />
        <result column="ROLE_ID" property="roleId" />
        <result column="RESOURCE_ID" property="resourceId" />
    </resultMap>
src/main/resources/mapper/RowLastnoMapper.xml
@@ -4,18 +4,18 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.RowLastno">
        <id column="whs_type" property="whsType" />
        <result column="wrk_mk" property="wrkMk" />
        <result column="current_row" property="currentRow" />
        <result column="s_row" property="sRow" />
        <result column="e_row" property="eRow" />
        <result column="crn_qty" property="crnQty" />
        <result column="memo" property="memo" />
        <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="limint_loc" property="limintLoc" />
        <id column="WHS_TYPE" property="whsType" />
        <result column="WRK_MK" property="wrkMk" />
        <result column="CURRENT_ROW" property="currentRow" />
        <result column="S_ROW" property="sRow" />
        <result column="E_ROW" property="eRow" />
        <result column="CRN_QTY" property="crnQty" />
        <result column="MEMO" property="memo" />
        <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="LIMINT_LOC" property="limintLoc" />
    </resultMap>
src/main/resources/mapper/StaDescMapper.xml
@@ -4,18 +4,18 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.StaDesc">
        <id column="type_id" property="typeId" />
        <result column="type_no" property="typeNo" />
        <result column="type_desc" property="typeDesc" />
        <result column="stn_no" property="stnNo" />
        <result column="stn_desc" property="stnDesc" />
        <result column="crn_no" property="crnNo" />
        <result column="crn_stn" property="crnStn" />
        <result column="memo" property="memo" />
        <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="TYPE_ID" property="typeId" />
        <result column="TYPE_NO" property="typeNo" />
        <result column="TYPE_DESC" property="typeDesc" />
        <result column="STN_NO" property="stnNo" />
        <result column="STN_DESC" property="stnDesc" />
        <result column="CRN_NO" property="crnNo" />
        <result column="CRN_STN" property="crnStn" />
        <result column="MEMO" property="memo" />
        <result column="APPE_USER" property="appeUser" />
        <result column="APPE_TIME" property="appeTime" />
        <result column="MODI_USER" property="modiUser" />
        <result column="MODI_TIME" property="modiTime" />
    </resultMap>
src/main/resources/mapper/UserLoginMapper.xml
@@ -4,10 +4,10 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.UserLogin">
        <id column="id" property="id" />
        <result column="user_id" property="userId" />
        <result column="token" property="token" />
        <result column="create_time" property="createTime" />
        <id column="ID" property="id" />
        <result column="USER_ID" property="userId" />
        <result column="TOKEN" property="token" />
        <result column="CREATE_TIME" property="createTime" />
    </resultMap>
src/main/resources/mapper/UserMapper.xml
@@ -4,14 +4,14 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.system.entity.User">
        <id column="id" property="id" />
        <result column="host_id" property="hostId" />
        <result column="username" property="username" />
        <result column="mobile" property="mobile" />
        <result column="password" property="password" />
        <result column="role_id" property="roleId" />
        <result column="create_time" property="createTime" />
        <result column="status" property="status" />
        <id column="ID" property="id" />
        <result column="HOST_ID" property="hostId" />
        <result column="USERNAME" property="username" />
        <result column="MOBILE" property="mobile" />
        <result column="PASSWORD" property="password" />
        <result column="ROLE_ID" property="roleId" />
        <result column="CREATE_TIME" property="createTime" />
        <result column="STATUS" property="status" />
    </resultMap>
src/main/resources/mapper/WaitPakinMapper.xml
@@ -4,26 +4,26 @@
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
        <result column="matnr" property="matnr" />
        <result column="maktx" property="maktx" />
        <result column="lgnum" property="lgnum" />
        <result column="type" property="type" />
        <result column="color" property="color" />
        <result column="supplier" property="supplier" />
        <result column="warehouse" property="warehouse" />
        <result column="brand" property="brand" />
        <result column="anfme" property="anfme" />
        <result column="altme" property="altme" />
        <result column="zpallet" property="zpallet" />
        <result column="bname" property="bname" />
        <result column="loc_no" property="locNo" />
        <result column="status" property="status" />
        <result column="io_status" property="ioStatus" />
        <result column="memo" property="memo" />
        <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="MATNR" property="matnr" />
        <result column="MAKTX" property="maktx" />
        <result column="LGNUM" property="lgnum" />
        <result column="TYPE" property="type" />
        <result column="COLOR" property="color" />
        <result column="SUPPLIER" property="supplier" />
        <result column="WAREHOUSE" property="warehouse" />
        <result column="BRAND" property="brand" />
        <result column="ANFME" property="anfme" />
        <result column="ALTME" property="altme" />
        <result column="ZPALLET" property="zpallet" />
        <result column="BNAME" property="bname" />
        <result column="LOC_NO" property="locNo" />
        <result column="STATUS" property="status" />
        <result column="IO_STATUS" property="ioStatus" />
        <result column="MEMO" property="memo" />
        <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>