Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r15201 -r15440
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 15201)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 15440)
@@ -60,10 +60,11 @@
  * @param extObj Ext对象,暂时有top.Ext,top.Ext4,Ext
  * @param fieldId 要设置时间区域的id
  * @param myFn 自定义的方法(可选)
+ * @param url 自定义url(可选)
  */
-function getServerTime(format,extObj,fieldId,myFn) {
+function getServerTime(format,extObj,fieldId,myFn,url) {
     extObj.Ajax.request({
-        url : WWWROOT + '/system/serverTimeAction!getServerDateTime.do',
+        url : url || WWWROOT + '/system/serverTimeAction!getServerDateTime.do',
         params : {dateformat : format},
         success : function(response, options) {
             var result = extObj.decode(response.responseText);
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15381 -r15440
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15381)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15440)
@@ -3703,7 +3703,7 @@
 
 
 		//设置开始时间为服务器当天当月第一天
-		getFirstDay('yyyy-MM-dd',Ext,'startDate');
+		getServerTime('yyyy-MM-dd',Ext,'startDate',null, WWWROOT + '/system/serverTimeAction!getFirstDay.do');
 		//设置结束时间为服务器当天时间
 		getServerTime('yyyy-MM-dd',Ext,'endDate');
 
@@ -3817,32 +3817,6 @@
      });*/
 	
 
-	
 
-	/**
-	 * 获取当月第一天
-	 * @param format 日期格式(按java的来写)
-	 * @param extObj 对应的extJs对象
-	 * @param fieldId 区域的id
-	 */
-	function getFirstDay(format,extObj,fieldId) {
-		extObj.Ajax.request({
-			url : WWWROOT + '/system/serverTimeAction!getFirstDay.do',
-			params : {dateFormat : format},
-			success : function(response, options) {
-				var result = extObj.decode(response.responseText);
-				if(result.success){
-					var resultTime = result.message;
-					extObj.getCmp(fieldId).setValue(resultTime);
-				}
-				else{
-					alert(result.message);
-				}
-			},
-			failure : function(response, options) {
-				alert('获取服务器时间失败');
-			}
-		});
-	}
 
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.jsp
===================================================================
diff -u -r12331 -r15440
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.jsp	(.../materialOutView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.jsp	(.../materialOutView.jsp)	(revision 15440)
@@ -11,12 +11,15 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>退库单信息</title>
-<script type="text/javascript" src="${ctx}/js/common.js" /></script>
-<script type="text/javascript" src="${ctx}/ext/example/examples.js" /></script>
+<script type="text/javascript" src="${ctx}/js/common.js" ></script>
+<script type="text/javascript" src="${ctx}/ext/example/examples.js" ></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
+<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/MaterialEntryTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/js/dateHelper.js" ></script>
+<script type="text/javascript" src="${ctx}/js/tBarForm.js" ></script>
 <script type="text/javascript">
 var supplier = '<%=Supplier.SUPPLIER_TYPE_SUPPLIER%>';//供货单位
 </script>
@@ -55,5 +58,10 @@
     </tr>
 </table>
 <input type="hidden" id="userName" value="${userName}">
+<form name="parametersFrm">
+    <input type="hidden" id="parm_s_startDate" name="parm_s_startDate" value="">
+    <input type="hidden" id="parm_s_endDate" name="parm_s_endDate" value="">
+    <input type="hidden" id="parm_s_keyWord" name="parm_s_keyWord" value="">
+</form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.jsp
===================================================================
diff -u -r13520 -r15440
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.jsp	(.../materialEntryView.jsp)	(revision 13520)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.jsp	(.../materialEntryView.jsp)	(revision 15440)
@@ -20,8 +20,9 @@
 var goodsType_expensiveGoods = '<%=MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS%>';
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
-<script type="text/javascript" src="${ctx}/js/common.js" /></script>
-<script type="text/javascript" src="${ctx}/ext/example/examples.js" /></script>
+<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js"></script>
+<script type="text/javascript" src="${ctx}/js/common.js"></script>
+<script type="text/javascript" src="${ctx}/ext/example/examples.js"></script>
 <script type="text/javascript" src="${ctx}/ext/grid/ForgonGrid.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/MaterialEntryTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
@@ -33,8 +34,10 @@
 <script type="text/javascript" src="materialEntryView.js"></script>
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js" /></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js" ></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js"></script>
+<script type="text/javascript" src="${ctx}/js/dateHelper.js" ></script>
+<script type="text/javascript" src="${ctx}/js/tBarForm.js" ></script>
 
 <script type="text/javascript">
 	var curUserName = '${userName}';
@@ -70,5 +73,10 @@
     </tr>
 </table>
 <input type="hidden" id="userName" value="${userName}">
+<form name="parametersFrm">
+    <input type="hidden" id="parm_s_startDate" name="parm_s_startDate" value="">
+    <input type="hidden" id="parm_s_endDate" name="parm_s_endDate" value="">
+    <input type="hidden" id="parm_s_keyWord" name="parm_s_keyWord" value="">
+</form>
 </body>
 </html>
\ No newline at end of file
Index: forgon-core/src/main/java/com/forgon/search/service/TBarFilterManager.java
===================================================================
diff -u
--- forgon-core/src/main/java/com/forgon/search/service/TBarFilterManager.java	(revision 0)
+++ forgon-core/src/main/java/com/forgon/search/service/TBarFilterManager.java	(revision 15440)
@@ -0,0 +1,53 @@
+package com.forgon.search.service;
+
+import com.forgon.databaseadapter.service.DateQueryAdapter;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+
+import java.text.ParseException;
+import java.util.Map;
+
+/**
+ * Created by zhonghaowen on 2016/10/20.
+ * dwr工具栏搜索抽象类,用来封装工具栏搜索的条件sql
+ * 后续的工具栏过滤搜索可以根据自己的业务逻辑来继承此类扩展
+ */
+public abstract class TBarFilterManager {
+
+    protected Logger logger = Logger.getLogger(this.getClass());
+
+    /**
+     * 统一条件过滤入口,根据页面传过来的参数,来拼接好需要过滤的条件sql
+     *
+     * @param sqlWhereParamMap dwr传过来的参数
+     * @param sql              需要拼接的sql
+     */
+    public abstract void filterPara(Map<String, String> sqlWhereParamMap, StringBuilder sql);
+
+
+    /**
+     * 通用的根据时间搜索(即大于开始时间且小于结束时间)
+     *
+     * @param sqlWhereParamMap dwr传过来的参数
+     * @param sql              需要拼接的sql
+     * @param poTimeProperty   对应po类的时间属性名
+     * @param dateQueryAdapter
+     */
+    public void createTimeFilterSql(Map<String, String> sqlWhereParamMap, StringBuilder sql, String poTimeProperty, DateQueryAdapter dateQueryAdapter) {
+        try {
+            String startTime = sqlWhereParamMap.get("startDate");
+            String endTime = sqlWhereParamMap.get("endDate");
+            if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+                String start = dateQueryAdapter.getDayStart(startTime);
+                String end = dateQueryAdapter.getDayEnd(endTime);
+                sql.append(String.format(" and (%s >= %s and %s < %s )", poTimeProperty, start, poTimeProperty, end));
+            }
+        }
+        catch (ParseException e) {
+            logger.error(e.getMessage(), e);
+            throw new RuntimeException(e);
+        }
+    }
+}
+
+
Index: forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java
===================================================================
diff -u -r14810 -r15440
--- forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java	(.../ServerTimeAction.java)	(revision 14810)
+++ forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java	(.../ServerTimeAction.java)	(revision 15440)
@@ -60,11 +60,13 @@
 	public void getFirstDay(){
 		try{
 			Date date = DateUtils.setDays(new Date(), 1);
-            String dateFormat = StrutsParamUtils.getPraramValue("dateFormat", "");
+            String dateFormat = StrutsParamUtils.getPraramValue("dateformat", "");
             if (StringUtils.isNotEmpty(dateFormat)){
                 DateFormat df = new SimpleDateFormat(dateFormat);
-                String resultTime = df.format(date);
-                StrutsResponseUtils.output(true, resultTime);
+                String serverTime = df.format(date);
+				JSONObject json = JSONUtil.buildJsonObject(true);
+				JSONUtil.addProperty(json, "serverTime",serverTime);
+                StrutsResponseUtils.output(json);
             }
 		}
 		catch(Exception e){
Index: forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
===================================================================
diff -u -r14586 -r15440
--- forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 14586)
+++ forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java	(.../DateQueryAdapter.java)	(revision 15440)
@@ -1,12 +1,14 @@
 package com.forgon.databaseadapter.service;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
+import org.apache.commons.lang3.time.DateUtils;
 
 /**
  * @author WangYi 2012-09-10 下午14:13:03 sql查询语句 date适配器服务类
@@ -308,4 +310,25 @@
 		}
 		throw new RuntimeException("参数非法!");
 	}
+
+
+	/**
+	 * 获得一天的开始
+	 * @param startTime
+	 * @return
+	 * @throws ParseException
+	 */
+	public String getDayStart(String startTime) throws ParseException {
+		return dateAdapter(DateUtils.parseDate(startTime, "yyyy-MM-dd"));
+	}
+
+	/**
+	 * 获得一天的结束
+	 * @param endTime
+	 * @return
+	 * @throws ParseException
+	 */
+	public String getDayEnd(String endTime) throws ParseException {
+		return dateAdapter(DateUtils.addDays(DateUtils.parseDate(endTime, "yyyy-MM-dd"),1));
+	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
===================================================================
diff -u -r15421 -r15440
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 15421)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 15440)
@@ -878,9 +878,10 @@
 		null 
 	);
 
+	var queryForm = new TBarForm(diposableGoodsStore).initForm();
 	var viewport = new Ext.Viewport( {
 		layout : 'border',
-		items : [{
+		items : [queryForm,{
 			region : 'center',
 			margins : '0 0 0 0',
 			layout : 'fit',
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java
===================================================================
diff -u -r13116 -r15440
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java	(.../MaterialEntryTableManager.java)	(revision 13116)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/dwr/table/MaterialEntryTableManager.java	(.../MaterialEntryTableManager.java)	(revision 15440)
@@ -1,20 +1,30 @@
 package com.forgon.disinfectsystem.tousse.materialmanager.dwr.table;
 
+import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import com.forgon.component.grid.GridManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry;
+import com.forgon.search.service.TBarFilterManager;
 import com.forgon.tools.util.SqlUtils;
+import org.apache.log4j.Logger;
 
+import javax.annotation.Resource;
+
 public class MaterialEntryTableManager {
 
 	private GridManager gridManager;
 	
 	private WareHouseManager wareHouseManager;
 
+	@Resource
+	private TBarFilterManager materialEntryTableFilterManagerImpl;
+
+	protected Logger logger = Logger.getLogger(this.getClass());
+
 	public void setGridManager(GridManager gridManager) {
 		this.gridManager = gridManager;
 	}
@@ -23,25 +33,29 @@
 		this.wareHouseManager = wareHouseManager;
 	}
 
-	public String findMaterialEntryTableList(
-			Map<String, List<String>> parameterMap) {
-
-		String sql = "where po.type='" + MaterialEntry.TYPE_IN + "'";
+	public String findMaterialEntryTableList(Map<String, List<String>> parameterMap) {
+		StringBuilder sql = new StringBuilder();
+		sql.append("where (po.type='" + MaterialEntry.TYPE_IN + "'");
 		Set<Long> currentUserWarehouseIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds();
-		sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.wareHouseId", currentUserWarehouseIds);
-		return gridManager.renderGrid(parameterMap,
-				MaterialEntry.class.getSimpleName(), sql,
-				new String[] { "itemsList" });
+		sql.append(" and ").append(SqlUtils.getNonStringFieldInCollectionsPredicate("po.wareHouseId", currentUserWarehouseIds));
+		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
+		materialEntryTableFilterManagerImpl.filterPara(sqlWhereParamMap,sql);
+		sql.append(")");
+		return gridManager.renderGrid(parameterMap, MaterialEntry.class.getSimpleName(), sql.toString(), new String[] { "itemsList" });
 	}
 
 	public String findMaterialEntryTableList2(
 			Map<String, List<String>> parameterMap) {
-
-		String sql = "where po.type='" + MaterialEntry.TYPE_OUT + "'";
+		StringBuilder sql = new StringBuilder();
+		sql.append("where (po.type='" + MaterialEntry.TYPE_OUT + "'");
 		Set<Long> currentUserWarehouseIds = wareHouseManager.getCurrentUserOrgUnitWarehouseIds();
-		sql += " and " + SqlUtils.getNonStringFieldInCollectionsPredicate("po.wareHouseId", currentUserWarehouseIds);
+		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
+		materialEntryTableFilterManagerImpl.filterPara(sqlWhereParamMap,sql);
+		sql.append(" and ").append(SqlUtils.getNonStringFieldInCollectionsPredicate("po.wareHouseId", currentUserWarehouseIds));
+		sql.append(")");
 		return gridManager.renderGrid(parameterMap,
-				MaterialEntry.class.getSimpleName(), sql, new String[] {});
+				MaterialEntry.class.getSimpleName(), sql.toString(), new String[] {});
 	}
 
+
 }
Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js
===================================================================
diff -u -r13119 -r15440
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js	(.../materialOutView.js)	(revision 13119)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialOutView.js	(.../materialOutView.js)	(revision 15440)
@@ -505,7 +505,8 @@
 		items : [ form ]
 	});
 	window.show();
-	top.Ext.getCmp('btnSave').setDisabled(false);
+	//这个js会报错,暂时屏蔽
+	// top.Ext.getCmp('btnSave').setDisabled(false);
 	if(type == 'insert'){
 		
 	}
@@ -567,7 +568,8 @@
 
 function editRecord(id){
 	addGodownEntry();
-	top.Ext.getCmp('btnSave').setDisabled(true);
+	//这个js会报错,暂时屏蔽
+	// top.Ext.getCmp('btnSave').setDisabled(true);
 	top.Ext.getCmp("serialNum").show();
 	top.Ext.getCmp('godownEntryForm').form.load({
 		url : WWWROOT + '/disinfectSystem/MaterialEntryAction!loadMaterialEntry.do',
@@ -701,9 +703,13 @@
 		null 
 	);
 
+
+	var tBarForm = new TBarForm();
+	tBarForm.setKeyWordStore(WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionData.do');
+	var queryForm = tBarForm.initForm();
 	var viewport = new Ext.Viewport( {
 		layout : 'border',
-		items : [{
+		items : [queryForm,{
 			region : 'center',
 			margins : '0 0 0 0',
 			layout : 'fit',
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryTableFilterManagerImpl.java
===================================================================
diff -u
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryTableFilterManagerImpl.java	(revision 0)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryTableFilterManagerImpl.java	(revision 15440)
@@ -0,0 +1,40 @@
+package com.forgon.disinfectsystem.tousse.materialmanager.service;
+
+import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.search.service.TBarFilterManager;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * Created by zhonghaowen on 2016/10/20.
+ */
+@Service("materialEntryTableFilterManagerImpl")
+public class MaterialEntryTableFilterManagerImpl extends TBarFilterManager {
+
+    @Resource
+    private DateQueryAdapter dateQueryAdapter;
+
+    @Override
+    public void filterPara(Map<String, String> sqlWhereParamMap, StringBuilder sql) {
+        this.createKeyWordFilterSql(sqlWhereParamMap, sql);
+        this.createTimeFilterSql(sqlWhereParamMap, sql, "po.time", dateQueryAdapter);
+    }
+
+    /**
+     * 根据关键字搜索(实际是根据关键字对应物品的id来搜索)
+     *
+     * @param sqlWhereParamMap
+     * @param sql
+     */
+    private void createKeyWordFilterSql(Map<String, String> sqlWhereParamMap, StringBuilder sql) {
+        String keyWord = sqlWhereParamMap.get("keyWord");
+        if (StringUtils.isNotEmpty(keyWord)) {
+            sql.append(String.format("and (po.id in (select mei.materialEntry.id from MaterialEntryItem mei join mei.materialDefinition md where md.id = '%s'))", keyWord));
+        }
+    }
+
+}
