diff --git a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
index 0a1c60b..68fd339 100644
--- a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
+++ b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
@@ -3750,7 +3750,7 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven
 						+" left join LOCATION loc on inv.LOCATION_ID=loc.ID "
 						+" left join STOCK sto on loc.stock=sto.ID "
 						+" right join (select containerCode from agvtask  "
-						+" 	where status='ATWORK') agv on agv.containerCode=sto.REMARK ";
+						+" 	where status='ATWORK') agv on agv.containerCode=sto.REMARK and inv.id is not null";
 				List<Long> ids= jdbcManager.getListLong(sql);
 				return ids;
 			}
diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
index 0e563d3..be7f4b8 100644
--- a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
+++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java
@@ -227,17 +227,19 @@ public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAu
 				if (invIds.size()>0) {
 					StringBuilder sb = new StringBuilder();
 			        for (int k = 0; k < invIds.size(); k++) {
-			            sb.append(invIds.get(k));
+			        	sb.append(invIds.get(k));
 			            if (k < invIds.size() - 1) {
 			                sb.append(",");
 			            }
 			        }
-					sqlBuffer.append(" CASE  "
-							+"   WHEN i.id IN ("
-							+ sb.toString()
-							+") THEN 1 "
-							+"   ELSE 0 "
-							+" END, ");
+			        if (sb.length()>0) {
+			        	sqlBuffer.append(" CASE  "
+								+"   WHEN i.id IN ("
+								+ sb.toString()
+								+") THEN 1 "
+								+"   ELSE 0 "
+								+" END, ");
+					}
 				}
 				sqlBuffer.append(" i.itemKey.lotInfo.propD2,i.itemKey.lotInfo.propC3,i.itemKey.lotInfo.propC1,i.statuss desc,i.storageDate,i.quantity,i.id");
 				String hql2=sqlBuffer.toString();