diff --git a/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java b/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java
index 9568521..9a8231d 100644
--- a/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java
+++ b/src/main/java/com/dev/energy/server/valuelist/adapter/hib3/Hibernate30Adapter.java
@@ -226,9 +226,9 @@ return translator.getSQLString();
 				}else{
 					String param_str=parm.toString();
 					param_str=param_str.trim();
-				 	if(param_str.indexOf("%")==0){
-				 		param_str=param_str.substring(1);
-		        	}
+//				 	if(param_str.indexOf("%")==0){
+//				 		param_str=param_str.substring(1);
+//		        	}
 					hql=hql.replace("{"+ketstr+"}", param_str);
 				}
 				
diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
index 20190bc..f874d38 100644
--- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
+++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultQueryAppManager.java
@@ -3451,12 +3451,14 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
 								" left join WORKER w on w.id=t.WORKER1_ID\r\n" + 
 								" where  t.agv_Status='1' and t.PLAN_QUANTITY>t.MOVED_QUANTITY_MU\r\n" + 
 								" and z.CARRIER_TYPE_ID=3 and t.agvTask_ID is null ";
+						if(z_id>0){
+							sql2+=" and z.id="+z_id+" ";
+						}
 						if(type.equals("0")){
 							sql2+=" and  w.id  is null ";
 						}else if(type.equals("1")){
 							sql2+=" and w.id="+userId+" ";
 						}
-						
 						sql2+="	GROUP BY t.BILLCODE,z.beBill,z.beStock " + 
 								"	ORDER BY max(pt.equated_Quantity) desc,max(t.dateBill1),t.BILLCODE";
 						Query   query   =   session.createSQLQuery(sql2);