Merge remote-tracking branch 'origin/jxtlfwcs' into jxtlfwcs

野心家

2025-06-19 020f48adb61a0350924783c1b397bd381d20ddc8

 src/main/resources/mapper/LocMastMapper.xml

@@ -34,6 +34,10 @@
        <result column="mk" property="mk" />
        <result column="barcode" property="barcode" />
        <result column="ctn_no" property="ctnNo" />
        <result column="pack_status" property="packStatus" />
        <result column="fire_status" property="fireStatus" />
        <result column="fire_no" property="fireNo" />
        <result column="channel" property="channel" />

    </resultMap>

@@ -59,4 +63,8 @@
        ORDER BY NEWID()
    </select>

    <select id="selectztgx" resultMap="BaseResultMap">
        select  top 1 * from asr_loc_mast where loc_sts in (#{sts1}) and channel=#{count}+1
    </select>

</mapper>