数据字典、品牌模糊查询忽略大小写；

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -466,7 +466,7 @@ public class ResourceSearchController {
             if (StringUtil.isNotBlank(param)){//模糊条件过滤
                 mapList = mapList
                         .stream()
-                        .filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
+                        .filter(map -> map.values().stream().anyMatch(value->value.toLowerCase().contains(param.toLowerCase())))
                         .collect(Collectors.toList());
             }
         }
@@ -532,7 +532,7 @@ public class ResourceSearchController {
             if (StringUtil.isNotBlank(param)){//输入查询条件过滤
                 mapList = mapList
                         .stream()
-                        .filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
+                        .filter(map -> map.values().stream().anyMatch(value->value.toLowerCase().contains(param.toLowerCase())))
                         .collect(Collectors.toList());
             }
             if (StringUtil.isNotBlank(notNull)){//某个字段的值不为空
@@ -737,7 +737,7 @@ public class ResourceSearchController {
             if (StringUtil.isNotBlank(param)){//输入查询条件过滤
                 resultMapList = resultMapList
                         .stream()
-                        .filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
+                        .filter(map -> map.values().stream().anyMatch(value->value.toLowerCase().contains(param.toLowerCase())))
                         .collect(Collectors.toList());
             }
             if (!CollectionUtils.isEmpty(resultMapList)){

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordApplicationImpl.java

@@ -42,6 +42,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @Auther: xin.lu
@@ -179,7 +180,15 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
                 query.setLifnr(sapPurchaseInfoRecordItem.getLifnr());
                 query.setMatkl(sapPurchaseInfoRecordItem.getMatkl());
                 synchronized(this) {
-                    List list=sapPurchaseInfoRecordItemApplication.querySapPurchaseInfoRecordItemByMaytkl(query);
+                    List<SapPurchaseInfoRecordItem> list=sapPurchaseInfoRecordItemApplication.querySapPurchaseInfoRecordItemByMaytkl(query);
+
+                    //如果明细中有相同的供应商和物料组 ，成功后还没有写库时，需要重新计算list大小
+                    List<SapPurchaseInfoRecordItem> sucessList = purchaseInfoRecordItemList.stream()
+                            .filter(purchaseInfoRecordItem -> "S".equals(purchaseInfoRecordItem.getTYPE())
+                                    && sapPurchaseInfoRecordItem.getLifnr().equals(purchaseInfoRecordItem.getLifnr())
+                                    && sapPurchaseInfoRecordItem.getMatkl().equals(purchaseInfoRecordItem.getMatkl())
+                            ).collect(Collectors.toList());
+                    list.addAll(sucessList);
                     if (list.size()>0){
                         sapPurchaseInfoRecordItemVo.setSortl("FYL"+formatSerialNumber(list.size()+1,7));
                     }else {

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapDictionaryApplicationImpl.java

@@ -79,7 +79,7 @@ public class SapDictionaryApplicationImpl implements SapDictionaryApplication {
             if (StringUtil.isNotBlank(param)){//输入查询条件过滤
                 mapList = mapList
                         .stream()
-                        .filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
+                        .filter(map -> map.values().stream().anyMatch(value->value.toLowerCase().contains(param.toLowerCase())))
                         .collect(Collectors.toList());
             }
             if (!CollectionUtils.isEmpty(mapList)){