bug修改

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -238,6 +238,8 @@ public class LiteOrderCache {
             if(order != null){
                 List<LiteOrderItem> items = liteOrderItemManager.findOrderItems(order.getId());
                 order.setOrderItems(items);
+
+                liteOrderMap.put(orderNo,order);
             }
         }
         return order;

src/main/java/com/neotel/smfcore/core/shelf/rest/AgvShelfController.java

@@ -52,8 +52,7 @@ public class AgvShelfController {
                     liteOrderCache.addOrderToMap(order);
                 }
                 String line=order.getLine();
-                if(!shelfInfo.getLine().equals(line)){
-
+                if( ObjectUtil.isEmpty(shelfInfo.getLine())||(!shelfInfo.getLine().equals(line)) ){
                     shelfInfo.setLine(line);
                     TaskShelfUtil.updateShelfInfo(shelfInfo);
                 }

src/main/java/com/neotel/smfcore/core/shelf/rest/TaskShelfController.java

@@ -107,7 +107,8 @@ public class TaskShelfController {
             taskService.updateFinishedTask(opTask);
 
 
-            List<String> usedRfidList = TaskShelfUtil.getUsedRfidList(opTask.getSourceName());
+//            List<String> usedRfidList = TaskShelfUtil.getUsedRfidList(opTask.getSourceName());
+            List<String> usedRfidList=TaskShelfUtil.getAllUsedRfids();
             resultMap.put("realRfid", loc.getRealRfid());
             resultMap.put("rfid", loc.getTempRfid());
             resultMap.put("usedRfidList", String.join(",", usedRfidList));
@@ -195,8 +196,9 @@ public class TaskShelfController {
                 log.info(" putShelfFinished barcode[" + barcode + "],rfid[" + rfid + "] 放料完成，更新任务状态为完成");
             }
             String orderNo = opTask.getSourceName();
-            List<String> usedRfidList = TaskShelfUtil.getUsedRfidList(orderNo);
+//            List<String> usedRfidList = TaskShelfUtil.getUsedRfidList(orderNo);
 
+            List<String> usedRfidList = TaskShelfUtil.getAllUsedRfids();
             ShelfInfo shelfInfo = TaskShelfUtil.findSameShelf(orderNo, rfid);
             if (shelfInfo != null) {
                 List<Integer> shelfEmpty = getEmptySlot(shelfInfo);

src/main/java/com/neotel/smfcore/core/shelf/util/TaskShelfUtil.java

@@ -276,7 +276,22 @@ public class TaskShelfUtil {
         }
         return usedRfidList;
     }
+    public static List<String> getAllUsedRfids( ) {
 
+        List<String> usedRfidList = new ArrayList<>();
+        for (Map<String, ShelfInfo> shelfMap : taskShelfMap.values()
+        ) {
+            if (shelfMap != null) {
+                for (ShelfInfo shelfInfo : shelfMap.values()) {
+                    String realRfid = shelfInfo.getRealRfid();
+                    if (ObjectUtil.isNotEmpty(realRfid)) {
+                        usedRfidList.add(realRfid);
+                    }
+                }
+            }
+        }
+        return usedRfidList;
+    }
     /**
      * 锁定架位
      */