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

luxiaotao1123

2022-03-15 dd37f7a757d46b6b2c43c60d292918ee8cb8634d

 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);