杰生迭代

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockCheckrecordServiceImpl.java

@@ -101,11 +101,21 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
         List<String> copyRfidList = new ArrayList<>(rfidList);
 
         // 默认在库rfid
+        List<Map<String, Object>> inHouseMaterialCodeList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
+                .select("MaterialCode materialCode")
+                .eq("IsDelete", 0)
+                .eq("StockHouseId", stockHouseId)
+                .ge("ExpiredDt", new Date())
+        );
+
+        List<String> materialCodeList = inHouseMaterialCodeList.stream()
+                .map(item -> Convert.toStr(item.get("materialCode"))).distinct().collect(Collectors.toList());
+
         List<Map<String, Object>> inHouseList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
                 .select("RfidCode rfidCode")
                 .eq("IsDelete", 0)
                 .eq("StockHouseId", stockHouseId)
-                .ge("ExpiredDt", new Date())
+                .in("MaterialCode", materialCodeList)
         );
 
         for (Map<String, Object> map : inHouseList) {