Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java
===================================================================
diff -u -r34049 -r34055
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java	(.../ConsumptiveMaterialContainerManagerImpl.java)	(revision 34049)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java	(.../ConsumptiveMaterialContainerManagerImpl.java)	(revision 34055)
@@ -169,6 +169,7 @@
 					record.setWarehouseId(warehouseId);
 					record.setWarehouseName(warehouseName);
 					record.setType(ReceiveRecord.TYPE_AUTO_DEDUCTION);
+					record.setRemark("自动申领，用于清洗耗材补充");
 					
 					//"[{'warehouseId':1,'warehouseName':'供应室仓库','consumptiveMaterialTypeId':10,'disposableGoodsBatchStockId':40051,'amount':1}]";
 					JSONArray itemsArray = new JSONArray();
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java
===================================================================
diff -u -r34046 -r34055
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java	(.../ConsumptiveMaterialContainerAction.java)	(revision 34046)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/action/ConsumptiveMaterialContainerAction.java	(.../ConsumptiveMaterialContainerAction.java)	(revision 34055)
@@ -230,7 +230,7 @@
 			PageEntity pageEntity = PageUtil.getPagePara();
 			String dateSql = "";
 			if(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){
-				dateSql = " and " + dateQueryAdapter.strDateAreasql("po.operationDateTime", startDate, endDate, true);
+				dateSql = " and " + dateQueryAdapter.dateAreaSql("po.operationDateTime", startDate, endDate, true);
 			}
 			String containerSql = "";
 			if(DatabaseUtil.isPoIdValid(consumptiveMaterialContainerId)){