1.取出料箱,任务不完成修改

2.如果有出库任务,则不允许入库

src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/controller/AgvDeviceController.java

@@ -64,6 +64,18 @@ public class AgvDeviceController {
             if (StringUtils.isNotEmpty(barcode.getPosName())) {
                 return ResultBean.newErrorResult(-1, "smfcore.materialBox.inPos", "物料已在库位{0}中", new String[]{barcode.getBarcode()});
             }
+
+            //判断出库任务有没有结束
+            List<DataLog> dataLogList = taskService.getAllTasks();
+            for (DataLog dataLog : dataLogList) {
+                if (dataLog.isCheckOutTask() && !dataLog.isFinished() && !dataLog.isCancel()) {
+                    if (barcode.getBarcode().equals(dataLog.getBarcode())) {
+                        return ResultBean.newErrorResult(-1,"","物料[" + dataLog.getBarcode() + "]已有出库任务,需继续执行出库动作");
+                    }
+                }
+            }
+
+
             //判断有没有任务
             DataLog dataLog = null;
             List<DataLog> allTasks = taskService.getAllTasks();
@@ -185,9 +197,10 @@ public class AgvDeviceController {
                     taskService.updateQueueTask(opTask);
                 } else {
                     taskService.moveTaskToFinished(opTask);
-                    if (OP_STATUS.OUT_ON_AGV.name().equals(statusStr)) {
+                    if (!opTask.isOutFromPos()) {
                         //从库位中取出,需要移到完成队列中,并且清理库存
                         BoxUtil.outFromPos(opTask);
+                        opTask.setOutFromPos(true);
                     }
                     taskService.updateFinishedTask(opTask);
                     if (OP_STATUS.FINISHED.name().equals(statusStr)) {