|
@@ -582,7 +582,7 @@ public class StatementOfAccountMergeServiceImpl implements StatementOfAccountMer
|
|
return Collections.emptyList();
|
|
return Collections.emptyList();
|
|
}
|
|
}
|
|
|
|
|
|
- List<String> skuSpecCodeList = outboundOrderList.stream().map(OutboundOrder::getSkuSpecCode).collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> skuSpecCodeList = outboundOrderList.stream().map(OutboundOrder::getSkuSpecCode).distinct().collect(Collectors.toList());
|
|
Map<String, String> map = skuSpecService.mapKV(SkuSpec::getCode, SkuSpec::getName, q -> q.in(SkuSpec::getCode, skuSpecCodeList));
|
|
Map<String, String> map = skuSpecService.mapKV(SkuSpec::getCode, SkuSpec::getName, q -> q.in(SkuSpec::getCode, skuSpecCodeList));
|
|
|
|
|
|
return outboundOrderList.stream()
|
|
return outboundOrderList.stream()
|
|
@@ -602,7 +602,12 @@ public class StatementOfAccountMergeServiceImpl implements StatementOfAccountMer
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 通过仓库编码获取仓库名称
|
|
|
|
+ *
|
|
|
|
+ * @param code 仓库编码
|
|
|
|
+ * @return 仓库名称
|
|
|
|
+ */
|
|
private String getWarehouseName(String code) {
|
|
private String getWarehouseName(String code) {
|
|
if (Objects.equals(code, "T007")) {
|
|
if (Objects.equals(code, "T007")) {
|
|
return "胜德体育仓-佰卓";
|
|
return "胜德体育仓-佰卓";
|