diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
index b0c5879..c773e73 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/rest/CockpitController.java
@@ -103,6 +103,7 @@ public class CockpitController{
       */
      @PostMapping("/workshopCondition")
      @Log("车间情况")
+     @SaIgnore
      @ApiOperation("车间情况")
      public CommonResult<Object> workshopCondition() {
           return RestBusinessTemplate.execute(cockpitService::workshopCondition);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_DEVICE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_DEVICE.wql
index d4dd086..d977e01 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_DEVICE.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_DEVICE.wql
@@ -79,7 +79,7 @@
             	`pdm_bi_device` d
             	LEFT JOIN pdm_bd_workorder w ON ( d.device_code = w.device_code
             	OR d.extend_code = w.device_code ) AND w.order_status <> '5'
-            	LEFT JOIN md_me_materialbase m ON w.material_id = m.material_id
+            	LEFT JOIN md_me_material_detail m ON w.material_id = m.material_id
             WHERE
             	d.is_used = '1'
             ORDER BY