diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index ac9fd93ad..2f77454e4 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -521,9 +521,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                         if (ObjectUtil.isEmpty(isLock)) {
                             if ("01".equals(placement_type) || "03".equals(placement_type)) {
                                 struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq").uniqueResult(0);
-                                break;
                             } else {
                                 struct_jo = WQLObject.getWQLObject("st_ivt_structattr").query("lock_type = '1' AND block_num = '" + block_num + "'AND placement_type = '" + placement_type + "' AND row_num = '" + row_num + "' AND is_delete = '0' AND is_used = '1' AND IFNULL(storagevehicle_code,'') <> '' order by out_order_seq desc").uniqueResult(0);
+                            }
+                            if (!ObjectUtil.isEmpty(struct_jo)){
                                 break;
                             }
                         } else {
@@ -548,8 +549,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                     map.put("lock_type", "4");
                     point_table.update(map, "point_code = '" + struct_jo.getString("struct_code") + "'");
                     struct_table.update(map, "struct_code = '" + struct_jo.getString("struct_code") + "'");
-
-
                 }
                 if ("4".equals(type)) {
                     CutConveyorTask cutConveyorTask = new CutConveyorTask();
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
index 6b03d0ca3..54f3dae62 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql
@@ -943,6 +943,7 @@
                 AND IFNULL( sa.storagevehicle_code, '' ) <> ''
                 AND sa.lock_type = '1'
                 AND sa.is_delete = '0'
+                AND sa.is_used = '1'
             GROUP BY
                 sa.block_num,
                 sa.row_num,