|
|
|
@ -3648,12 +3648,12 @@ public class BeanTransitionUtils { |
|
|
|
|
if(StringUtils.isNotBlank(ddtxxBO.getXTLY()) && OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(ddtxxBO.getXTLY())){ |
|
|
|
|
Map<String, List<DdmxxxBO>> collect = ddmxList.stream().collect(Collectors.groupingBy(t -> t.getZXBM())); |
|
|
|
|
log.info("拆分数据:{}", JSONObject.toJSONString(collect)); |
|
|
|
|
for (int i = 0; i < collect.size(); i++) { |
|
|
|
|
for (Map.Entry<String, List<DdmxxxBO>> listEntry : collect.entrySet()) { |
|
|
|
|
List<DdmxxxBO> ddmxxxBOS = listEntry.getValue(); |
|
|
|
|
DdzxxBO ddzxxBONew = new DdzxxBO(); |
|
|
|
|
DdtxxBO ddtxxBONew = new DdtxxBO(); |
|
|
|
|
List<DdmxxxBO> ddmxLists = new ArrayList<>(); |
|
|
|
|
BeanUtils.copyProperties(ddtxxBO, ddtxxBONew); |
|
|
|
|
List<DdmxxxBO> ddmxxxBOS = collect.get(i); |
|
|
|
|
BigDecimal zje = new BigDecimal("0.00"); |
|
|
|
|
BigDecimal bhsje = new BigDecimal("0.00"); |
|
|
|
|
BigDecimal se = new BigDecimal("0.00"); |
|
|
|
@ -3677,7 +3677,6 @@ public class BeanTransitionUtils { |
|
|
|
|
ddzxxBONew.setDDTXX(ddtxxBO); |
|
|
|
|
ddzxxBONew.setDDMXXX(ddmxLists); |
|
|
|
|
ddzxxList.add(ddzxxBONew); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|