Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

昨天 a488088a18a9b8808bc57124681cee8c4ada7299

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/OutStockService.java

@@ -20,6 +20,7 @@
    R genOutStock(List<DeliveryItem> ids, Long loginUserId);

    R generateWaves(GenWaveParams ids);
    R generateWavesOrderAuto(GenWaveParams ids,String stationId,String locCode);

    R saveOutStock(AsnOrderAndItemsParams params, Long loginUserId);