Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java
===================================================================
diff -u -r20938 -r20976
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java	(.../GodownEntryManager.java)	(revision 20938)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManager.java	(.../GodownEntryManager.java)	(revision 20976)
@@ -97,8 +97,4 @@
 	 */
 	public void modifyGodownEntryItemBaseData(String items,JSONObject jsonObj);
 
-	/**
-	 * 入库单json添加hrp入库时间的属性(现阶段只有中大附一使用)
-	 */
-	public String gridAddHrpTime(String json);
 }
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r20938 -r20976
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 20938)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 20976)
@@ -2817,37 +2817,4 @@
 			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-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
===================================================================
diff -u -r20946 -r20976
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java	(.../InventoryManagerImpl.java)	(revision 20946)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java	(.../InventoryManagerImpl.java)	(revision 20976)
@@ -1173,6 +1173,7 @@
 				}
 				godownEntry.setSerialNumber(storageEntry.getSerialNumber());
 				godownEntry.setTime(now);
+				godownEntry.setHrpTime(storageEntry.getTime());//添加同步入库单的时间
 				
 				godownEntry.setWarehouseID(WareHouse.getId());
 				godownEntry.setWarehouseName(WareHouse.getName());
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
===================================================================
diff -u -r20183 -r20976
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java	(.../GodownEntry.java)	(revision 20183)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java	(.../GodownEntry.java)	(revision 20976)
@@ -38,6 +38,8 @@
 	
 	private Date time;  // 入库/退库时间
 	
+	private Date HrpTime;//同步入库单时间
+	
 	private String remark; //备注
 	
 	/**
@@ -375,6 +377,14 @@
 		return false;
 	}
 
+	public Date getHrpTime() {
+		return HrpTime;
+	}
+
+	public void setHrpTime(Date hrpTime) {
+		HrpTime = hrpTime;
+	}
+
 	public void calculateTotalPrice() {
 		totalPrice = 0.0;
 		List<GodownEntryItem> items = getItemsList();
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r20938 -r20976
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 20938)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 20976)
@@ -176,10 +176,6 @@
 		String json = gridManager.renderGrid(parameterMap,
 				GodownEntry.class.getSimpleName(), sql,
 				new String[] { "itemsList" });
-		//是否需要显示hrp入库时间,该功能目前只有中大附一使用
-		if(CssdUtils.getSystemSetConfigByNameBool("GodownEntryShowHrpTime", false)){
-			 json = godownEntryManager.gridAddHrpTime(json);
-		}
 		return json;
 	}
 	/**