diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java
index 88cd4ed0f..f2c2b3673 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java
@@ -371,8 +371,8 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
                     JSONObject b1 = b1_data.getJSONObject(j);
                     if (b1.getString("device_code").equals(row.getString("device_code"))) {
                         b1.put("region_code", row.getString("region_code"));
+                        data.add(b1);
                     }
-                    data.add(b1);
                 }
             }
         }
@@ -383,17 +383,16 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
                     JSONObject blk = blk_data.getJSONObject(j);
                     if (blk.getString("device_code").equals(row.getString("device_code"))) {
                         blk.put("region_code", row.getString("region_code"));
+                        data.add(blk);
                     }
-                    data.add(blk);
                 }
             }
         }
         //查询内包间套轴对接位的异常
-        if (inArea.contains("NBJ") && (StrUtil.isEmpty(region_code) || region_code.equals("NBJ")) ) {
+        if (inArea.contains("CBJ") && (StrUtil.isEmpty(region_code) || region_code.equals("CBJ")) ) {
             IBstIvtCutpointivtService bean2 = SpringContextHolder.getBean(IBstIvtCutpointivtService.class);
             List<BstIvtCutpointivt> list = bean2.list(new LambdaQueryWrapper<BstIvtCutpointivt>()
                     .eq(BstIvtCutpointivt::getPoint_type, "1")
-                    .eq(BstIvtCutpointivt::getIs_used, "1")
                     .ne(BstIvtCutpointivt::getRemark, "")
                     .isNotNull(BstIvtCutpointivt::getRemark)
                     .eq(BstIvtCutpointivt::getPoint_status, "2"));
@@ -401,7 +400,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
                 JSONObject row = new JSONObject();
                 row.put("device_code", a.getPoint_code());
                 row.put("device_name", a.getPoint_code());
-                row.put("region_code", "NBJ");
+                row.put("region_code", "CBJ");
                 row.put("error_code", "");
                 row.put("error_message", a.getRemark());
                 data.add(row);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
index e3531b8b9..318a4398a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql
@@ -403,7 +403,9 @@
                 	is_used = '1'
                 	AND IFNULL(po.material_code,'') = ''
                 	AND po.region_id = 输入.reging_id
-                	AND po.point_location = 输入.point_location
+                	OPTION 输入.point_location <> ""
+                	    po.point_location = 输入.point_location
+                	ENDOPTION
                 	AND po.point_type = 输入.point_type
                 	AND NOT EXISTS (
                 	SELECT
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
index fe2236f42..6aafb9ffa 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
@@ -244,6 +244,7 @@ public class OutHotTask extends AbstractAcsTask {
         String point_code1 = form.getString("point_code1");
         String point_code2 = form.getString("point_code2");
         String point_code3 = form.getString("point_code3");
+        String task_status = form.getString("task_status");
         if (cutConveyorTask.isSingleTask(point_code1)) {
             throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
         }
@@ -265,7 +266,11 @@ public class OutHotTask extends AbstractAcsTask {
         } else {
             json.put("task_type", "010202");
         }
-        json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
+        if (StrUtil.isNotEmpty(task_status)) {
+            json.put("task_status", task_status);
+        }else {
+            json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode());
+        }
         json.put("point_code1", form.getString("point_code1"));
         json.put("point_code2", form.getString("point_code2"));
         json.put("point_code3", form.getString("point_code3"));