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

whycq

2023-03-15 f0d2defd354a3d6fbaf77338f0c42fe133f019fd

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -39,6 +39,14 @@
    LocMast queryDemoLoc(Integer crn);

    /**
     * 堆垛机演示获取目标库位
     * @param crn
     * @param locType1
     * @return
     */
    LocMast queryDemoLoc0(Integer crn, short locType1);

    /**
     * 检查当前库位所属巷道的空库位数量
     * @param locMast
     * @return