质检、理货备货bug修复、web优化

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/ErpBarcodesInvServiceImpl.java

@@ -88,16 +88,15 @@ public class ErpBarcodesInvServiceImpl implements IErpBarcodesInvService
                         (StringUtils.isNotBlank(erpBarCodesVO.getSpecs()) ? StringUtils.contains(item.getModel(), erpBarCodesVO.getSpecs()) : Boolean.TRUE)).collect(Collectors.toList());
         Map<String, BaseSku> skuMap = baseSkuList.stream().collect(Collectors.toMap(BaseSku::getSku, Function.identity()));
 
-        for (ErpBarCodesVO erpBarCodes : erpBarCodesVOList) {
-            BaseLocationInfo baseLocationInfo = baseLocationInfoMap.get(erpBarCodes.getLocationId());
-            if (ObjectUtil.isNull(baseLocationInfo)) continue;
-            BaseSku baseSku = skuMap.get(erpBarCodes.getSku());
-            if (ObjectUtil.isNull(baseSku)) continue;
-            erpBarCodes.setLocationNo(baseLocationInfo.getLocationNo());
-            erpBarCodes.setSkuName(baseSku.getDesc1());
-            erpBarCodes.setSpecs(baseSku.getModel());
-            result.add(erpBarCodes);
-        }
+        erpBarCodesVOList.stream().filter(item ->
+                ObjectUtil.isNotNull(baseLocationInfoMap.get(item.getLocationId())) || ObjectUtil.isNotNull(skuMap.get(item.getSku()))).forEach(item -> {
+            BaseLocationInfo baseLocationInfo = baseLocationInfoMap.get(item.getLocationId());
+            BaseSku baseSku = skuMap.get(item.getSku());
+            item.setLocationNo(baseLocationInfo.getLocationNo());
+            item.setSkuName(baseSku.getDesc1());
+            item.setSpecs(baseSku.getModel());
+            result.add(item);
+        });
         return result;
     }