|
@@ -514,6 +514,13 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
|
|
|
return excelBoList;
|
|
|
}
|
|
|
|
|
|
+ for (IssueImportExcelBo issueImportExcelBo : excelBoList) {
|
|
|
+ if (ObjectUtil.isEmpty(issueImportExcelBo.getProductCustomCode())){
|
|
|
+ issueImportExcelBo.setProductCustomCode("");
|
|
|
+ issueImportExcelBo.setProductName("");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
//相同产品合并
|
|
|
Map<String, IssueImportExcelBo> collect = excelBoList.stream().collect(Collectors.groupingBy(IssueImportExcelBo::getProductCustomCode,
|
|
|
Collectors.collectingAndThen(Collectors.toList(), value -> {
|