|
|
@ -2042,8 +2042,12 @@ public class OrderInfoServiceImpl implements OrderInfoService { |
|
|
|
}).collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm())); |
|
|
|
}).collect(Collectors.groupingBy(t -> t.getFphxz() + t.getXmmc() + t.getXmdw() + t.getGgxh() + t.getSl() + t.getSpbm())); |
|
|
|
List<OrderItemInfo> orderItemInfoList = new ArrayList<>(); |
|
|
|
List<OrderItemInfo> orderItemInfoList = new ArrayList<>(); |
|
|
|
List<String> deleteItem = new ArrayList<>(); |
|
|
|
List<String> deleteItem = new ArrayList<>(); |
|
|
|
|
|
|
|
log.debug("合并名称分组{}",JSONObject.toJSONString(collect1)); |
|
|
|
for (List<OrderItemInfo> value : collect1.values()) { |
|
|
|
for (List<OrderItemInfo> value : collect1.values()) { |
|
|
|
if(value.size() == 1){continue;} |
|
|
|
if(value.size() == 1){ |
|
|
|
|
|
|
|
log.debug("跳过合并{}",JSONObject.toJSONString(value)); |
|
|
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
} |
|
|
|
BigDecimal xmsl = new BigDecimal("0"); |
|
|
|
BigDecimal xmsl = new BigDecimal("0"); |
|
|
|
BigDecimal xmje = new BigDecimal("0"); |
|
|
|
BigDecimal xmje = new BigDecimal("0"); |
|
|
|
BigDecimal se = new BigDecimal("0"); |
|
|
|
BigDecimal se = new BigDecimal("0"); |
|
|
|