Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b3407e28 由 LN
选项

感应料架bug修改

1 个父辈 656051db
内嵌 并排
正在显示 1 个修改的文件 包含 49 行增加 和 24 行删除
src/main/java/com/neotel/smfcore/core/device/handler/impl/SensorShelfHandler.java
...@@ -91,7 +91,7 @@ public class SensorShelfHandler extends BaseDeviceHandler { ...@@ -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 { ...@@ -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 { ...@@ -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,32 +390,47 @@ public class SensorShelfHandler extends BaseDeviceHandler { ...@@ -380,32 +390,47 @@ public class SensorShelfHandler extends BaseDeviceHandler {
if(noReelPosList != null){ if(noReelPosList != null){
//出库 //出库
for (String posName : noReelPosList) { for (String posName : noReelPosList) {
String outResult = ""; StoragePos pos = storagePosManager.getByPosName(posName);
Collection<DataLog> queueTasks = taskService.getQueueTasks(); if(pos == null){
for (DataLog queueTask : queueTasks) { String msg = "未找到库位:"+String.join(",",hasReelPosList) ;
if(queueTask.isCheckOutTask() && queueTask.getPosName().equals(posName)){ log.error(msg);
//出库完成 WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
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()){ else if(!pos.getStorageId().equals(storage.getId())){
outNgList.add(posName); String msg = "["+storage.getName()+"]未找到库位:"+String.join(",",hasReelPosList) ;
String msg = "未找到["+posName+"]的出库任务";
log.error(msg); log.error(msg);
WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR)); WebSocketServer.sendMsg("",new SocketMsg(msg, MsgType.ERROR));
}else if(pos.getBarcode()==null){
log.info("料架[" + cid + "]出库库位[" + pos.getPosName() + "]已为空 ");
}else{ }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);
}
} }
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!