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 86fae4aba..88cd4ed0f 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
@@ -341,7 +341,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
 
 
         //查询当前人员对应的设备是多少
-        JSONArray b1_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'B1'").getResultJSONArray(0);
+        JSONArray b1_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'B1' AND is_crux = '1'").getResultJSONArray(0);
         List<String> b1List = new ArrayList<>();
         for (int i = 0; i < b1_rows.size(); i++) {
             JSONObject row = b1_rows.getJSONObject(i);
@@ -352,7 +352,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
         // 调用acs接口获取设备
         JSONArray b1_data = result.getJSONArray("data");
 
-        JSONArray blk_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'BLK'").getResultJSONArray(0);
+        JSONArray blk_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'BLK' AND is_crux = '1'").getResultJSONArray(0);
         List<String> blkList = new ArrayList<>();
         for (int i = 0; i < blk_rows.size(); i++) {
             JSONObject row = blk_rows.getJSONObject(i);
@@ -389,7 +389,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
             }
         }
         //查询内包间套轴对接位的异常
-        if (inArea.contains("NBJ")) {
+        if (inArea.contains("NBJ") && (StrUtil.isEmpty(region_code) || region_code.equals("NBJ")) ) {
             IBstIvtCutpointivtService bean2 = SpringContextHolder.getBean(IBstIvtCutpointivtService.class);
             List<BstIvtCutpointivt> list = bean2.list(new LambdaQueryWrapper<BstIvtCutpointivt>()
                     .eq(BstIvtCutpointivt::getPoint_type, "1")
diff --git a/lms/nladmin-ui/src/views/wms/agvrush/deviceerror/index.vue b/lms/nladmin-ui/src/views/wms/agvrush/deviceerror/index.vue
index 35cc67f56..8834789a4 100644
--- a/lms/nladmin-ui/src/views/wms/agvrush/deviceerror/index.vue
+++ b/lms/nladmin-ui/src/views/wms/agvrush/deviceerror/index.vue
@@ -21,7 +21,7 @@
               @change="crud.toQuery"
             >
               <el-option
-                v-for="item in dict.DEVICE_REGION_TYPE"
+                v-for="item in dict.DEVICE_ERROR_REGION"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -66,7 +66,7 @@ const defaultForm = {
 }
 export default {
   name: 'Deviceerror',
-  dicts: ['DEVICE_ERROR_TYPE', 'IS_OR_NOT', 'DEVICE_REGION_TYPE', 'product_area'],
+  dicts: ['DEVICE_ERROR_TYPE', 'IS_OR_NOT', 'DEVICE_ERROR_REGION', 'product_area'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
diff --git a/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue b/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue
index e87e2163f..a89ede003 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue
@@ -116,7 +116,7 @@ export default {
       level: 3,
       currentId: 0, menuLoading: false, showButton: false,
       menus: [], menuIds: [], depts: [], deptDatas: [], // 多选时使用
-      tableData: [{ 'region_code': 'B1Foil', 'region_name': 'B1生箔' }, { 'region_code': 'B1FQ', 'region_name': 'B1分切' }, { 'region_code': 'B2Foil', 'region_name': 'B2生箔' }, { 'region_code': 'B2FQ', 'region_name': 'B2分切' }, { 'region_code': 'CBJ', 'region_name': '穿拔轴区' }, { 'region_code': 'NBJ', 'region_name': '内包间' }, { 'region_code': 'RK', 'region_name': '入库区' }, { 'region_code': 'CK', 'region_name': '出库区' }],
+      tableData: [{ 'region_code': 'B1Foil', 'region_name': 'B1生箔' }, { 'region_code': 'B1FQ', 'region_name': 'B1分切' }, { 'region_code': 'B2Foil', 'region_name': 'B2生箔' }, { 'region_code': 'B2FQ', 'region_name': 'B2分切' }, { 'region_code': 'CBJ', 'region_name': '穿拔轴区' }, { 'region_code': 'NBJ', 'region_name': '内包间' }, { 'region_code': 'RK', 'region_name': '入库区' }, { 'region_code': 'DDJ', 'region_name': '堆垛机' }, { 'region_code': 'CK', 'region_name': '出库区' }],
       currentRow: null,
       permission: {
         add: ['admin', 'roles:add'],