Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2 天以前 1504150a9e26ef221fc6ac4e0ad494446968d06d

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

@@ -49,6 +49,8 @@
    private OutStockService outStockService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private BasStationService basStationService;


    /**
@@ -72,6 +74,7 @@
        }

        String siteNo = map.getSiteNo();

        List<LocItem> items = map.getItems();
        Map<Long, List<LocItem>> listMap = items.stream().collect(Collectors.groupingBy(LocItem::getLocId));
        WkOrder order;