Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r26912 -r26926
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 26912)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 26926)
@@ -871,7 +871,7 @@
 		}
 		// 回写物资系统
 		if (writeBackInventoryHelper != null) {
-			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品退货后开始回写");
+			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品(器械包)退货后开始回写");
 			writeBackInventoryHelper.writeBackForReturnGoods(
 					Collections.singleton(returnGoodsRecord.getId()), true);
 		}else{
@@ -999,8 +999,11 @@
 
 		// 回写物资系统
 		if (writeBackInventoryHelper != null) {
+			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "物品(一次性物品)退货后开始回写");
 			writeBackInventoryHelper.writeBackForReturnGoods(
 					Collections.singleton(returnGoodsRecord.getId()), true);
+		}else{
+			appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS_WRITEBACK, Log.TYPE_WRITE, "未配置物资回写bean:writeBackInventoryHelper");
 		}
 //		if(true){
 //			throw new RuntimeException("速度测试!");
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java
===================================================================
diff -u -r26648 -r26926
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java	(.../WriteBackInventoryManagerImpl.java)	(revision 26648)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java	(.../WriteBackInventoryManagerImpl.java)	(revision 26926)
@@ -787,30 +787,36 @@
 					item.setInventorySerialNumber(inventorySerialNumber);
 					item.setBatchNumber(dgb.getBatchNumber());
 					item.setExpDate(dgb.getExpDate());
-					item.setAmount((long) returnGoodsItem.getAmount());
+					Integer amount = returnGoodsItem.getAmount();
+					if(amount != null){
+						item.setAmount(new Long(amount));
+					}
 					item.setUnitPrice(returnGoodsItem.getPrice());
 					item.setFluctuationUnitPrice(returnGoodsItem
 							.getFluctuationPrice());
 					
-					CategorySubject categorySubject = projectDaoMybatis.getCategorySubjectByCategoryCode(disposableGoods.getCategoryCode());
-					if(categorySubject == null){
-						logger.error("根据材料分类编码"+ disposableGoods.getCategoryCode() +"未匹配到支出项");
-						canInvokeInterface = false;
-					}else{
-						//根据支出项编码判断list是否已存在该支出项
-						if(CollectionUtils.isNotEmpty(subjectMapList)){
-							for (Map<String, Object> map : subjectMapList) {
-								if(StringUtils.equals((String)map.get("subjectCode") , categorySubject.getSubjectCode())){
-									map.put("freezeAmount", (Double)map.get("freezeAmount") + returnGoodsItem.getAmount() * returnGoodsItem.getPrice());
+					//针对中山眼科中心新的herp厂商增加需要的相关回写信息(中间表的store_code,bus_type_code,exch_store_code字段分别对应)
+					if(CssdUtils.isProject("zsykzx")){
+						CategorySubject categorySubject = projectDaoMybatis.getCategorySubjectByCategoryCode(disposableGoods.getCategoryCode());
+						if(categorySubject == null){
+							logger.error("根据材料分类编码"+ disposableGoods.getCategoryCode() +"未匹配到支出项");
+							canInvokeInterface = false;
+						}else{
+							//根据支出项编码判断list是否已存在该支出项
+							if(CollectionUtils.isNotEmpty(subjectMapList)){
+								for (Map<String, Object> map : subjectMapList) {
+									if(StringUtils.equals((String)map.get("subjectCode") , categorySubject.getSubjectCode())){
+										map.put("freezeAmount", (Double)map.get("freezeAmount") + returnGoodsItem.getAmount() * returnGoodsItem.getPrice());
+									}
 								}
+							}else{
+								Map<String , Object> subjectMap = new HashMap<String, Object>();
+								
+								subjectMap.put("subjectCode", categorySubject.getSubjectCode());//科目编码
+								subjectMap.put("subjectName", categorySubject.getSubjectName());//科目名称
+								subjectMap.put("freezeAmount", returnGoodsItem.getAmount() * returnGoodsItem.getPrice());//冻结金额
+								subjectMapList.add(subjectMap);
 							}
-						}else{
-							Map<String , Object> subjectMap = new HashMap<String, Object>();
-							
-							subjectMap.put("subjectCode", categorySubject.getSubjectCode());//科目编码
-							subjectMap.put("subjectName", categorySubject.getSubjectName());//科目名称
-							subjectMap.put("freezeAmount", returnGoodsItem.getAmount() * returnGoodsItem.getPrice());//冻结金额
-							subjectMapList.add(subjectMap);
 						}
 					}
 				}