Commit a47c696f LN

入库获取库位号时不需要验证是否有出库任务。

1 个父辈 b540bcfd
...@@ -449,20 +449,19 @@ public class RobotBoxHandler extends BaseDeviceHandler { ...@@ -449,20 +449,19 @@ public class RobotBoxHandler extends BaseDeviceHandler {
if (pos != null) { if (pos != null) {
Storage storage = dataCache.getStorageById(pos.getStorageId()); Storage storage = dataCache.getStorageById(pos.getStorageId());
//如果所在料仓有出库任务未完成,暂停入库 //如果所在料仓有出库任务未完成,暂停入库
Collection<DataLog> tasks = taskService.getAllTasks(); // Collection<DataLog> tasks = taskService.getAllTasks();
for (DataLog task : tasks) { // for (DataLog task : tasks) {
if (task.isCheckOutTask() && task.getStorageId().equals(pos.getStorageId())) { // if (task.isCheckOutTask() && task.getStorageId().equals(pos.getStorageId())) {
if ((!task.isFinished()) && (!task.isInRobot())&&(!task.isInLine()) ) { // if ((!task.isFinished()) && (!task.isInRobot())&&(!task.isInLine()) ) {
// errorMsg = "库位[" + pos.getPosName() + "]所在料仓有出库任务,暂停入库"; // errorMsg = "PosName[" + pos.getPosName() + "]There are outgoing tasks in the silo, suspend storage";
errorMsg = "PosName[" + pos.getPosName() + "]There are outgoing tasks in the silo, suspend storage"; // lineMsg = errorMsg;
lineMsg = errorMsg; // resultMap.put("result", "99");
resultMap.put("result", "99"); // resultMap.put("msg", errorMsg);
resultMap.put("msg", errorMsg); // log.info("[" + barcode.getBarcode() + "]分到库位[" + pos.getPosName() + "]所在料仓有出库任务,暂停入库");
log.info("[" + barcode.getBarcode() + "]分到库位[" + pos.getPosName() + "]所在料仓有出库任务,暂停入库"); // return resultMap;
return resultMap; // }
} // }
} // }
}
resultMap.put("result", "0"); resultMap.put("result", "0");
resultMap.put("msg", "ok"); resultMap.put("msg", "ok");
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!