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

1

昨天 e596214d84efa77d0cf316563548f1b1d7643a37

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

@@ -45,6 +45,7 @@
     * 组托
     */
    void comb(CombParam param, Long userId);
    void combAuto(CombParam param, Long userId);

    /**
     * 齐套入库查询
@@ -57,6 +58,11 @@
    void kittingCall(String locNo, Long userId);

    /**
     * 在库标记修改
     */
    R locOriginInOut(LocDetl param,  Long userId);

    /**
     * 上架
     */
    void onSale(CombParam param);