Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r20654 -r20938
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20654)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 20938)
@@ -221,5 +221,7 @@
   //同步入库的默认查询开始时间为当天: true为启用,false为不启用
   sycDefaultStartTime : true,
   //是否启用扫描器械包固定条码清洗功能: true为启用,false为不启用
-  endbleScanTousseFixationBarcode : true
+  endbleScanTousseFixationBarcode : true,
+  //一次性物品入库单页面是否显示hrp入库时间 : true为启用,false为不启用
+  GodownEntryShowHrpTime : true
 }
\ No newline at end of file
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r20273 -r20938
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 20273)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 20938)
@@ -15,10 +15,12 @@
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryItemManager;
 import com.forgon.disinfectsystem.diposablegoods.service.GodownEntryManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
@@ -171,9 +173,14 @@
 
 		sqlWhereParamMap.put("type", GodownEntry.TYPE_IN);
 		String sql = getGodownEntryListHql2(sqlWhereParamMap);
-		return gridManager.renderGrid(parameterMap,
+		String json = gridManager.renderGrid(parameterMap,
 				GodownEntry.class.getSimpleName(), sql,
 				new String[] { "itemsList" });
+		//是否需要显示hrp入库时间,该功能目前只有中大附一使用
+		if(CssdUtils.getSystemSetConfigByNameBool("GodownEntryShowHrpTime", false)){
+			 json = godownEntryManager.gridAddHrpTime(json);
+		}
+		return json;
 	}
 	/**
 	 * 获取入库单和退库单列表打印数据,不分页
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r20356 -r20938
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 20356)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 20938)
@@ -1885,6 +1885,7 @@
 		},
 		{header : "操作员",width : 200,dataIndex : 'operator'},
 		{header : "入库时间",width : 200,dataIndex : 'time' , renderer : myDateFormatByMinute},
+		{header : "HRP入库时间",width : 200,dataIndex : 'hrpTime' , renderer : myDateFormatByMinute, hidden : !sstsConfig.GodownEntryShowHrpTime},
 		{header : "金额",width : 200,dataIndex : 'totalPrice'},
 		{header : "供应商",width : 200,dataIndex : 'supplierName'},
 		{id : 'operationRemark',header : "备注",width : 120,dataIndex : 'remark'}
@@ -1899,7 +1900,8 @@
 	    {name : 'totalPrice'}, 
 	    {name : 'supplierName'},
 	    {name : 'dataStatus'},
-	    {name : 'subType'}
+	    {name : 'subType'},
+	    {name : 'hrpTime'}
 	];
 	
 	var filters = new Ext.grid.GridFilters({
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r20513 -r20938
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 20513)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 20938)
@@ -1,6 +1,7 @@
 package com.forgon.disinfectsystem.diposablegoods.service;
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -45,7 +46,9 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordDiposableGoodsItem;
 import com.forgon.disinfectsystem.inventorymanagement.constant.gdsy.ConstantDefinition;
+import com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao;
 import com.forgon.disinfectsystem.inventorymanagement.dao.WriteBackInventoryDao;
+import com.forgon.disinfectsystem.inventorymanagement.model.StorageEntry;
 import com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryHelper;
 import com.forgon.disinfectsystem.vo.DisposableGoodsStorageAdjustVo;
 import com.forgon.disinfectsystem.vo.GodownEntryItemPrintVO;
@@ -92,6 +95,12 @@
 	
 	private BarcodeManager barcodeManager;
 	
+	private InventoryDao inventoryDao;
+	
+	public void setInventoryDao(InventoryDao inventoryDao) {
+		this.inventoryDao = inventoryDao;
+	}
+
 	public void setWriteBackInventoryHelper(
 			WriteBackInventoryHelper writeBackInventoryHelper) {
 		this.writeBackInventoryHelper = writeBackInventoryHelper;
@@ -2808,4 +2817,37 @@
 			jsonObj.put("message", e.getMessage());
 		}
 	}
+
+	@Override
+	public String gridAddHrpTime(String json) {
+		if(StringUtils.isNotBlank(json)){
+			try {
+				//转回json对象
+				JSONObject obj = JSONObject.fromObject(json);
+				//获得rows的json数组
+				net.sf.json.JSONArray rows = obj.optJSONArray("rows");
+				for (Object object : rows) {
+					JSONObject jsonObj = (JSONObject) object;
+					//获得rows中的入 json对象
+					String type = jsonObj.optString("subType");
+					//是否为同步入库
+					if(GodownEntry.SUBTYPE_SYNC_IN.equals(type)){
+						String serialNumber = jsonObj.optString("serialNumber");
+						//根据同步入库单号获得hrp入库时间
+						StorageEntry storageEntry = inventoryDao.findInEntryBySerialNumber(serialNumber);
+						String hrpTime ="";
+						if(storageEntry!=null){
+							SimpleDateFormat sdf = new SimpleDateFormat("yyy-MM-dd");
+							 hrpTime = sdf.format(storageEntry.getTime());
+						}
+						jsonObj.put("hrpTime", hrpTime);
+					}
+				}
+				return obj.toString();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		return json;
+	}
 }
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
===================================================================
diff -u -r20183 -r20938
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java	(.../GodownEntryManager.java)	(revision 20183)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java	(.../GodownEntryManager.java)	(revision 20938)
@@ -96,4 +96,9 @@
 	 * @param jsonObj 接收返回的参数
 	 */
 	public void modifyGodownEntryItemBaseData(String items,JSONObject jsonObj);
+
+	/**
+	 * 入库单json添加hrp入库时间的属性(现阶段只有中大附一使用)
+	 */
+	public String gridAddHrpTime(String json);
 }