diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
index 29a4089b..eb103b37 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
@@ -33,7 +33,7 @@ public class RedissonUtils {
         try {
             if (isLock){
                 process.process();
-            }{
+            } else {
                 throw new BadRequestException("当前业务 key:"+key+"正在锁定请稍后再试");
             }
         }finally {
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 2b215acb..99e959d4 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
@@ -188,7 +188,7 @@
             	sch_cacheline_position.positionorder_no as seat_order_num,
             	sch_cacheline_vehilematerial.workprocedure_code,
             	sch_cacheline_vehilematerial.workprocedure_name,
-            	sch_cacheline_vehilematerial.material_uuid,
+            	sch_cacheline_vehilematerial.material_id as material_uuid,
             	sch_cacheline_vehilematerial.material_code,
             	sch_cacheline_vehilematerial.material_name,
             	sch_cacheline_vehilematerial.material_spec,