fix

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java

@@ -144,8 +144,8 @@ public class MJXLTask extends AbstractTask {
             if ((ObjectUtil.isEmpty(schBasePoint.getVehicle_type()) ||
                     materialType.equals(schBasePoint.getVehicle_type()))
                     && "2".equals(schBasePoint.getPoint_status())
-                    && schBasePoint.getVehicle_qty() < 3
-                    && (device_code.equals(schBasePoint.getExt_point_code())||ObjectUtil.isEmpty(schBasePoint.getExt_point_code()))) {
+                    && schBasePoint.getVehicle_qty() < 3) {
+//                    && (device_code.equals(schBasePoint.getExt_point_code())||ObjectUtil.isEmpty(schBasePoint.getExt_point_code()))) {
                 //新增逻辑，同一列只能放相同物料
                 boolean flag=true;
                 List<String> list=new ArrayList<>();

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java

@@ -158,6 +158,10 @@ public class TBXBKJTask extends AbstractTask {
             if(task.getTask_code().equals(schBasePoint.getIng_task_code())){
                 return schBasePoint;
             }
+            if(ObjectUtil.isNotEmpty(schBasePoint.getIng_task_code())){
+                log.error("当前点位存在其他任务{},暂不执行",schBasePoint.getIng_task_code());
+                return null;
+            }
             if (schBasePoint.getVehicle_qty() > 0 &&
                     (ObjectUtil.isEmpty(schBasePoint.getIng_task_code()))) {
                 if (temp == null ||