|
|
|
@ -951,7 +951,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { |
|
|
|
|
}).collect(Collectors.groupingBy(t->OrderMergeUtil.getOrderItemInfoKey(t, mergeRuleType))); |
|
|
|
|
List<OrderItemInfo> orderItemInfoList = new ArrayList<>(); |
|
|
|
|
List<String> deleteItem = new ArrayList<>(); |
|
|
|
|
log.debug("明细合并前明细数据,{}",JSONObject.toJSONString(orderItemInfos)); |
|
|
|
|
log.info("明细合并前明细数据,{}",JSONObject.toJSONString(orderItemInfos)); |
|
|
|
|
for (List<OrderItemInfo> value : collect1.values()) { |
|
|
|
|
if(value.size() == 1){continue;} |
|
|
|
|
BigDecimal xmsl = new BigDecimal("0"); |
|
|
|
@ -1001,7 +1001,7 @@ public class OrderMergeServiceImpl implements OrderMergeService { |
|
|
|
|
return R.error("当前勾选明细行未发现满足合并条件的数据"); |
|
|
|
|
} |
|
|
|
|
mergeOutItem.addAll(orderItemInfoList); |
|
|
|
|
log.debug("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem)); |
|
|
|
|
log.info("明细合并合并后{}", JSONObject.toJSONString(mergeOutItem)); |
|
|
|
|
|
|
|
|
|
//对比合计税额的误差,此处将不参与和与参与合并合并对比
|
|
|
|
|
BigDecimal hjse = mergeOutItem.stream().map(t -> new BigDecimal(t.getSe())).reduce(BigDecimal::add).get(); |
|
|
|
|