24282 2 jaren geleden
bovenliggende
commit
1a559dabf4

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

@@ -111,18 +111,22 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
         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)
-                .in("MaterialCode", materialCodeList)
-        );
+        if (materialCodeList.size() > 0) {
 
-        for (Map<String, Object> map : inHouseList) {
-            String rfidCode = Convert.toStr(map.get("rfidCode"));
-            if (!rfidList.contains(rfidCode)) {
-                rfidList.add(rfidCode);
+            List<Map<String, Object>> inHouseList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
+                    .select("RfidCode rfidCode")
+                    .eq("IsDelete", 0)
+                    .eq("StockHouseId", stockHouseId)
+                    .in("MaterialCode", materialCodeList)
+            );
+
+            for (Map<String, Object> map : inHouseList) {
+                String rfidCode = Convert.toStr(map.get("rfidCode"));
+                if (!rfidList.contains(rfidCode)) {
+                    rfidList.add(rfidCode);
+                }
             }
+
         }
 
         log.error("\r\n盘点结束:\r\n扫描仓库:{}\r\n扫描到的rfid:{},\r\n添加默认在库后的rfid:{}",