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

whycq

2022-03-16 4dd1de806329aee03af0cf9f63521af1da81d2df

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -31,7 +31,7 @@

    // 入库第三步，当堆垛机把货放入库位时
//    @Select("select top 1 from dbo.asr_wrk_mast where wrk_no=#{workNo}")
    WrkMast selectPakInStep7(@Param("workNo")Integer workNo);
    WrkMast selectCrnWaiting(@Param("workNo")Integer workNo);

    WrkMast selectPakInStep45(@Param("workNo")Integer workNo);