感应料架bug修改

src/main/java/com/neotel/smfcore/core/device/handler/impl/SensorShelfHandler.java

@@ -91,7 +91,7 @@ public class SensorShelfHandler extends BaseDeviceHandler {
         if(groupId!=null&&groupId.equals("-1")){
         if(groupId!=null&&groupId.equals("-1")){
             groupId="";
             groupId="";
         }
         }
-//        WebSocketServer.sendMsg(token, new SocketMsg("这是一个webSocket消息："+code, MsgType.INFO));
+//        WebSocketServer.sendMsg("", new SocketMsg("这是一个webSocket消息："+code, MsgType.INFO));
         String loginUser = SecurityUtils.getLoginUsername();
         String loginUser = SecurityUtils.getLoginUsername();
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         ResultBean resultBean = null;
         ResultBean resultBean = null;
@@ -336,7 +336,17 @@ public class SensorShelfHandler extends BaseDeviceHandler {
                     String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
                     String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
                     log.error(msg);
                     log.error(msg);
                     WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
                     WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
-                }else{
+                }
+                else if(!pos.getStorageId().equals(storage.getId())){
+                    String msg = "["+storage.getName()+"]未找到库位:"+String.join(",",hasReelPosList) ;
+                    log.error(msg);
+                    WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
+                }
+                //如果库位有料，直接结束
+                else if(pos.getBarcode()!=null) {
+                    log.info("料架[" + cid + "]入库库位[" + pos.getPosName() + "]已有料： [" + pos.getBarcode().getBarcode() + "]");
+                }
+                else{
                     Collection<DataLog> queueTasks = taskService.getQueueTasks();
                     Collection<DataLog> queueTasks = taskService.getQueueTasks();
                     for (DataLog queueTask : queueTasks) {
                     for (DataLog queueTask : queueTasks) {
                         boolean isPutInTask=false;
                         boolean isPutInTask=false;
@@ -352,7 +362,7 @@ public class SensorShelfHandler extends BaseDeviceHandler {
                            queueTask.setCid(cid);
                            queueTask.setCid(cid);
                            queueTask.setPosId(pos.getId());
                            queueTask.setPosId(pos.getId());
                            queueTask.setPosName(pos.getPosName());
                            queueTask.setPosName(pos.getPosName());
-                           queueTask.setStorageId(pos.getStorageId());
+                           queueTask.setStorageId(storage.getId());
                            queueTask.setStorageName(storage.getName());
                            queueTask.setStorageName(storage.getName());
                            try {
                            try {
                                //入库完成,发送入库完成请求
                                //入库完成,发送入库完成请求
@@ -380,6 +390,19 @@ public class SensorShelfHandler extends BaseDeviceHandler {
         if(noReelPosList != null){
         if(noReelPosList != null){
             //出库
             //出库
             for (String posName : noReelPosList) {
             for (String posName : noReelPosList) {
+                StoragePos pos = storagePosManager.getByPosName(posName);
+                if(pos == null){
+                    String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
+                    log.error(msg);
+                    WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
+                }
+                else if(!pos.getStorageId().equals(storage.getId())){
+                    String msg = "["+storage.getName()+"]未找到库位:"+String.join(",",hasReelPosList) ;
+                    log.error(msg);
+                    WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
+                }else if(pos.getBarcode()==null){
+                    log.info("料架[" + cid + "]出库库位[" + pos.getPosName() + "]已为空 ");
+                }else{
                     String outResult = "";
                     String outResult = "";
                     Collection<DataLog> queueTasks = taskService.getQueueTasks();
                     Collection<DataLog> queueTasks = taskService.getQueueTasks();
                     for (DataLog queueTask : queueTasks) {
                     for (DataLog queueTask : queueTasks) {
@@ -407,6 +430,8 @@ public class SensorShelfHandler extends BaseDeviceHandler {
                         outOkList.add(outResult);
                         outOkList.add(outResult);
                     }
                     }
                 }
                 }
+
+            }
         }
         }
 
 
         Map<String,List<String>> dataMap = new HashMap<>();
         Map<String,List<String>> dataMap = new HashMap<>();