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

zjj

2024-11-09 728ae1ba12ed4f59fa4dd897b74dd55b415856e5

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

@@ -97,4 +97,8 @@

    void turnMatLocDetl(EmptyPlateOutParam param, Long userId);

    /**
     * 并板出库
     */
    void locMergeOut(StockOutParam param, Long userId);
}