diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
index 7f8d2ed0..ec88fd7d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
@@ -860,7 +860,7 @@ public class CacheLineHandServiceImpl implements CacheLineHandService{
           AtomicReference<JSONArray> res = new AtomicReference<>(new JSONArray());
           RedissonUtils.lock(() -> {
                // 生产区域
-               res.set(WQL.getWO("PDA_QUERY").addParamMap(MapOf.of("flag", "8", "product_area", productArea, "cacheLine_code", pointCode)).process().getResultJSONArray(0));
+               res.set(WQL.getWO("PDA_QUERY").addParamMap(MapOf.of("flag", "8", "product_area", productArea, "cacheline_code", pointCode)).process().getResultJSONArray(0));
           }, pointCode, 3);
           return res.get();
      }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql
index 803144ac..dedfcfaf 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/wql/PDA_QUERY.wql
@@ -198,7 +198,7 @@
             	md_me_materialbase.material_spec,
             	sch_cacheline_vehilematerial.quantity,
             	sch_cacheline_vehilematerial.weight,
-            IF(length(sch_cacheline_position.vehicle_code) > 0, IFNULL(sch_cacheline_vehilematerial.vehicle_status, 4), 5) AS vehicle_status
+            IF(length(sch_cacheline_position.vehicle_code) > 0, IFNULL(sch_cacheline_vehilematerial.vehicle_status, 4), 1) AS vehicle_status
             FROM
             	sch_cacheline_position
             	LEFT JOIN sch_cacheline_vehilematerial ON sch_cacheline_position.vehicle_code = sch_cacheline_vehilematerial.vehicle_code
@@ -212,7 +212,7 @@
             	    sch_cacheline_position.cacheline_code = 输入.cacheline_code
             	ENDOPTION
             ORDER BY
-            	sch_cacheline_position.cacheline_code
+            	sch_cacheline_position.cacheline_code, sch_cacheline_position.layer_num, sch_cacheline_position.positionorder_no, sch_cacheline_position.cache_line_no
             ENDSELECT
         ENDQUERY
     ENDIF