Merge branch 'master' of http://47.97.1.152:5880/r/zy-wcs-master

lsh

2026-04-21 720e0926fa1c94b952c26e111206c5d6e1ed5ba2

 src/main/resources/mapper/WrkMastMapper.xml

@@ -39,6 +39,28 @@
        limit 0,1
    </select>

    <update id="updateWrkStsByWrkNoAndCurrentWrkSts">
        update asr_wrk_mast
        set wrk_sts = #{wrkSts}
        where wrk_no = #{wrkNo}
          and wrk_sts = #{currentWrkSts}
    </update>

    <delete id="deleteByWrkNoAndCurrentWrkSts">
        delete from asr_wrk_mast
        where wrk_no = #{wrkNo}
          and wrk_sts = #{currentWrkSts}
    </delete>

    <delete id="deleteByWrkNoAndMkIn">
        delete from asr_wrk_mast
        where wrk_no = #{wrkNo}
          and mk in
        <foreach collection="mks" item="mk" open="(" separator="," close=")">
            #{mk}
        </foreach>
    </delete>

    <select id="selectCrnTaskCountList" resultType="com.zy.asrs.domain.vo.WrkTaskCountVo">
        select
            crn_no as deviceNo,