Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java
===================================================================
diff -u -r18603 -r18605
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java	(.../OperationReservationTableManager.java)	(revision 18603)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/operationreservation/dwr/table/OperationReservationTableManager.java	(.../OperationReservationTableManager.java)	(revision 18605)
@@ -72,13 +72,13 @@
 		if(StringUtils.isNotBlank(operationTime_start) && StringUtils.isNotBlank(operationTime_end)){
 			operationTime_start += " 00:00:00";
 			operationTime_end += " 23:59:59";
-			invoiceStatusSql = String.format(" and operationTime between %s and %s ", dateQueryAdapter.dateAdapter(operationTime_start),
+			operationTimeSql = String.format(" and operationTime between %s and %s ", dateQueryAdapter.dateAdapter(operationTime_start),
 					dateQueryAdapter.dateAdapter(operationTime_end));
 		}else if(StringUtils.isNotBlank(operationTime_start)){
 			operationTime_start += " 00:00:00";
-			invoiceStatusSql = String.format(" and operationTime >= %s ", dateQueryAdapter.dateAdapter(operationTime_start));
+			operationTimeSql = String.format(" and operationTime >= %s ", dateQueryAdapter.dateAdapter(operationTime_start));
 		}else if(StringUtils.isNotBlank(operationTime_end)){
-			invoiceStatusSql = String.format(" and operationTime <= %s ", dateQueryAdapter.dateAdapter(operationTime_end));
+			operationTimeSql = String.format(" and operationTime <= %s ", dateQueryAdapter.dateAdapter(operationTime_end));
 		}
 		StringBuilder sqls = new StringBuilder();
 		sqls.append(committedStatusSql);
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r18603 -r18605
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 18603)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 18605)
@@ -929,7 +929,7 @@
 					forceSelection : true,
 					store : new Ext.data.SimpleStore({
 	    				fields : ['value'],
-	    				data : [['全部'],['已发货'],['部分发货'],['未发货']]
+	    				data : [['全部'],['已发货'],['部分发货'],['待发货']]
 	    			})
 				}]
 			},{