感应料架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")){
             groupId="";
         }
-//        WebSocketServer.sendMsg(token, new SocketMsg("这是一个webSocket消息："+code, MsgType.INFO));
+//        WebSocketServer.sendMsg("", new SocketMsg("这是一个webSocket消息："+code, MsgType.INFO));
         String loginUser = SecurityUtils.getLoginUsername();
         Collection<DataLog> queueTasks = taskService.getQueueTasks();
         ResultBean resultBean = null;
@@ -336,7 +336,17 @@ public class SensorShelfHandler extends BaseDeviceHandler {
                     String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
                     log.error(msg);
                     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();
                     for (DataLog queueTask : queueTasks) {
                         boolean isPutInTask=false;
@@ -352,7 +362,7 @@ public class SensorShelfHandler extends BaseDeviceHandler {
                            queueTask.setCid(cid);
                            queueTask.setPosId(pos.getId());
                            queueTask.setPosName(pos.getPosName());
-                           queueTask.setStorageId(pos.getStorageId());
+                           queueTask.setStorageId(storage.getId());
                            queueTask.setStorageName(storage.getName());
                            try {
                                //入库完成,发送入库完成请求
@@ -380,32 +390,47 @@ public class SensorShelfHandler extends BaseDeviceHandler {
         if(noReelPosList != null){
             //出库
             for (String posName : noReelPosList) {
-                String outResult = "";
-                Collection<DataLog> queueTasks = taskService.getQueueTasks();
-                for (DataLog queueTask : queueTasks) {
-                    if(queueTask.isCheckOutTask() && queueTask.getPosName().equals(posName)){
-                        //出库完成
-                        try {
-                            outResult = posName;
-                            super.finishedOutPos(cid,posName);
-                            String msg = queueTask.getBarcode()+ "从"+ posName+"出库成功";
-                            log.error(msg);
-                            WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.INFO));
-                            break;
-                        } catch (Exception e) {
-                            log.error("出库出错",e);
-                            return ResultBean.newErrorResult(-1,"smfcore.checkoutError","出库出错:{0}" ,new String[]{ e.getMessage()});
-                        }
-                    }
+                StoragePos pos = storagePosManager.getByPosName(posName);
+                if(pos == null){
+                    String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
+                    log.error(msg);
+                    WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
                 }
-                if(outResult.isEmpty()){
-                    outNgList.add(posName);
-                    String msg = "未找到["+posName+"]的出库任务";
+                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{
-                    outOkList.add(outResult);
+                    String outResult = "";
+                    Collection<DataLog> queueTasks = taskService.getQueueTasks();
+                    for (DataLog queueTask : queueTasks) {
+                        if(queueTask.isCheckOutTask() && queueTask.getPosName().equals(posName)){
+                            //出库完成
+                            try {
+                                outResult = posName;
+                                super.finishedOutPos(cid,posName);
+                                String msg = queueTask.getBarcode()+ "从"+ posName+"出库成功";
+                                log.error(msg);
+                                WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.INFO));
+                                break;
+                            } catch (Exception e) {
+                                log.error("出库出错",e);
+                                return ResultBean.newErrorResult(-1,"smfcore.checkoutError","出库出错:{0}" ,new String[]{ e.getMessage()});
+                            }
+                        }
+                    }
+                    if(outResult.isEmpty()){
+                        outNgList.add(posName);
+                        String msg = "未找到["+posName+"]的出库任务";
+                        log.error(msg);
+                        WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
+                    }else{
+                        outOkList.add(outResult);
+                    }
                 }
+
             }
         }