1.转库问题修改

src/main/java/com/neotel/smfcore/core/equipment/handler/impl/BaseEquipHandler.java

@@ -63,6 +63,7 @@ public class BaseEquipHandler implements IEquipmentHandler {
                     }
                     }
                 }*/
                 }*/
             }
             }
+            statusBean.setTime(System.currentTimeMillis());
             EquipStatusUtil.updateStatusBean(statusBean);
             EquipStatusUtil.updateStatusBean(statusBean);
 
 
         } catch (Exception e) {
         } catch (Exception e) {

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

@@ -658,11 +658,19 @@ public class LiteOrderCache {
         List<DataLog> allTasks = taskService.getAllTasks();
         List<DataLog> allTasks = taskService.getAllTasks();
         Collection<String> operatingPosIds = new HashSet<>();
         Collection<String> operatingPosIds = new HashSet<>();
         for (DataLog task : allTasks) {
         for (DataLog task : allTasks) {
-            if(task.isCheckOutTask()){
+            //if(task.isCheckOutTask()){
                 String posId = task.getPosId();
                 String posId = task.getPosId();
                 if (!Strings.isNullOrEmpty(posId)) {
                 if (!Strings.isNullOrEmpty(posId)) {
                     operatingPosIds.add(task.getPosId());
                     operatingPosIds.add(task.getPosId());
                 }
                 }
+            //}
+        }
+        Set<String> allLockPosIds = ReelLockPosUtil.getAllLockPosIds();
+        if (allLockPosIds != null && !allLockPosIds.isEmpty()){
+            for (String lockPosId : allLockPosIds) {
+                if (StringUtils.isNotEmpty(lockPosId)) {
+                    operatingPosIds.add(lockPosId);
+                }
             }
             }
         }
         }
         return operatingPosIds;
         return operatingPosIds;