Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/WriteBackInventoryDaoImpl.java
===================================================================
diff -u -r21250 -r21278
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/WriteBackInventoryDaoImpl.java	(.../WriteBackInventoryDaoImpl.java)	(revision 21250)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/sznsrmyy/WriteBackInventoryDaoImpl.java	(.../WriteBackInventoryDaoImpl.java)	(revision 21278)
@@ -162,7 +162,7 @@
 			//回写数据map对各集合中各元素的identification一致的进行数量汇总
 			List<Map<String, Object>> writeBackDataMapList = new ArrayList<Map<String, Object>>();
 			for(DisposableGoodsStorageAdjustVo disposableGoodsStorageAdjustVo : disposableGoodsStorageAdjustVoList){
-				String identification = "";
+				String identification = null;
 				Long disposableGoodsID = null;
 				if(DatabaseUtil.isPoIdValid(disposableGoodsStorageAdjustVo.getDisposableGoodsIdentificationId())){
 					DisposableGoodsIdentification disposableGoodsIdentification = 
@@ -197,7 +197,11 @@
 //					}
 //				}else{
 					Map<String, Object> newMap = new HashMap<String, Object>();
-					newMap.put("identification", identification);//批次id
+					if(identification!=null){
+						newMap.put("identification", identification);//批次id
+					}else{
+						newMap.put("identification", "");//批次id
+					}
 					newMap.put("amount", disposableGoodsStorageAdjustVo.getAdjustAmount());//数量
 					newMap.put("unit",disposableGoods.getUnitID());//单位id
 					newMap.put("remark","");//备注
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r21106 -r21278
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 21106)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 21278)
@@ -233,5 +233,5 @@
   // 发货计划列表界面是否显示一次性物品类型
   invoicePlanExtractedView_showDisposableGoodsType:true,
   //一次性物品入库单页面是否显示hrp入库时间 : true为启用,false为不启用
-  GodownEntryShowHrpTime : true
+  godownEntryShowHrpTime : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r20938 -r21278
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 20938)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 21278)
@@ -1885,7 +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 : "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'}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java
===================================================================
diff -u -r20976 -r21278
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java	(.../GodownEntry.java)	(revision 20976)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/GodownEntry.java	(.../GodownEntry.java)	(revision 21278)
@@ -38,7 +38,10 @@
 	
 	private Date time;  // 入库/退库时间
 	
-	private Date HrpTime;//同步入库单时间
+	/**
+	 * hrp那边入库单的入库时间
+	 */
+	private Date hrpTime;
 	
 	private String remark; //备注
 	
@@ -378,11 +381,11 @@
 	}
 
 	public Date getHrpTime() {
-		return HrpTime;
+		return hrpTime;
 	}
 
 	public void setHrpTime(Date hrpTime) {
-		HrpTime = hrpTime;
+		this.hrpTime = hrpTime;
 	}
 
 	public void calculateTotalPrice() {