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

野心家

2025-04-01 66942458f7753fe4ddee7c5ed3386d61cff28b24

 src/main/resources/mapper/TaskWrkMapper.xml

@@ -24,6 +24,7 @@
        <result column="crn_no" property="crnNo" />
        <result column="command_step" property="commandStep" />
        <result column="transfer_mark" property="transferMark" />
        <result column="mark_start" property="markStart"/>

    </resultMap>
    
@@ -48,7 +49,7 @@

    <select id="selectPakIn" resultMap="BaseResultMap">
        select top 1 * from dbo.wcs_task_wrk
        where status=1
        where status=2
        and crn_no=#{crnNo}
        and wrk_no=#{workNo}
        and start_point=#{startPoint}
@@ -133,4 +134,10 @@
        order by io_pri desc,create_time,wrk_no ASC
    </select>

    <select id="selectStaWorking" resultMap="BaseResultMap">
        select top 1 * from dbo.wcs_task_wrk_log
        where wrk_no = #{workNo}
        order by create_time DESC
    </select>

</mapper>