Merge branch 'master' of git.picaiba.com:CaiXiang/cigs4 into yanyang

Reviewed-on: #40

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java

@@ -28,10 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 包装箱表
@@ -143,9 +141,22 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
 //        matchColor(dto);
         QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
-        wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT);
+        //重复上片基板去重
+//        wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT);
         List<WoPackagingBoxSubstrate> woPackagingBoxSubstrateList = substrateMapper.selectList(wrapper);
-        dto.setSubstrateList(woPackagingBoxSubstrateList);
+        List<WoPackagingBoxSubstrate> distinctList = new ArrayList<>();
+        Map<String, List<WoPackagingBoxSubstrate>> map = woPackagingBoxSubstrateList.stream().sorted(Comparator.comparing(WoPackagingBoxSubstrate::getCreateTime).reversed())
+                .collect(Collectors.groupingBy(WoPackagingBoxSubstrate::getWoSubstrateId));
+        for (Map.Entry<String, List<WoPackagingBoxSubstrate>> entry : map.entrySet()) {
+            //取list首并放入到新list中
+            distinctList.add(entry.getValue().get(0));
+        }
+//        List<WoPackagingBoxSubstrate> distinctList = woPackagingBoxSubstrateList.stream().collect(
+//                Collectors.collectingAndThen(
+//                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(WoPackagingBoxSubstrate::getWoSubstrateId))), ArrayList::new)
+//        );
+        List<WoPackagingBoxSubstrate> sortedDistinctList = distinctList.stream().sorted(Comparator.comparing(WoPackagingBoxSubstrate::getSlot)).collect(Collectors.toList());
+        dto.setSubstrateList(sortedDistinctList);
         return dto;
     }