Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java
===================================================================
diff -u -r34055 -r34070
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java	(.../ConsumptiveMaterialContainerManagerImpl.java)	(revision 34055)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/service/ConsumptiveMaterialContainerManagerImpl.java	(.../ConsumptiveMaterialContainerManagerImpl.java)	(revision 34070)
@@ -149,8 +149,8 @@
 		
 		//自动生成领用记录
 		//receiveRecord = "[{'warehouseId':10154,'warehouseName':'供应室仓库','consumptiveMaterialTypeId':10,'disposableGoodsBatchStockId':40051,'amount':1}]";
-		if(StringUtils.isNotBlank(receiveRecord)){
-			JSONArray receiveRecordArray = JSONArray.fromObject(receiveRecord);
+		if(CollectionUtils.isNotEmpty(newVolumes) && StringUtils.isNotBlank(receiveRecord)){
+			JSONArray receiveRecordArray = getReceiveRecordArray(receiveRecord, newVolumes);
 			if(receiveRecordArray != null && receiveRecordArray.size() >0){
 				for (int i=0;i<receiveRecordArray.size();i++) {
 					
@@ -187,6 +187,42 @@
 	}
 	
 	/**
+	 * 只为已经补充的耗材添加领用记录
+	 * @param receiveRecord
+	 * @param newVolumes
+	 * @return
+	 */
+	private JSONArray getReceiveRecordArray(String receiveRecord, List<ConsumptiveMaterialVolume> newVolumes) {
+		JSONArray result = new JSONArray();
+		JSONArray receiveRecordArray = JSONArray.fromObject(receiveRecord);
+		Map<Long, ConsumptiveMaterialType> consumptiveMaterialTypeMap = new HashMap<Long, ConsumptiveMaterialType>();
+		if(CollectionUtils.isNotEmpty(newVolumes)){
+			for (ConsumptiveMaterialVolume v : newVolumes) {
+				ConsumptiveMaterialType type = v.getConsumptiveMaterialType();
+				if(type == null){
+					continue;
+				}
+				consumptiveMaterialTypeMap.put(type.getId(), type);
+			}
+		}
+		if(receiveRecordArray != null && receiveRecordArray.size() >0){
+			for(int i=0;i<receiveRecordArray.size();i++){
+				JSONObject json = receiveRecordArray.optJSONObject(i);
+				Long consumptiveMaterialTypeId = json.optLong("consumptiveMaterialTypeId");
+				if(!DatabaseUtil.isPoIdValid(consumptiveMaterialTypeId)){
+					continue;
+				}
+				if(!consumptiveMaterialTypeMap.containsKey(consumptiveMaterialTypeId)){
+					continue;
+				}
+				result.add(json);
+			}
+		}
+		return result;
+	}
+	
+
+	/**
 	 * 判断清洗机是否绑定其它容器
 	 * @param newRinsers
 	 * @param consumptiveMaterialContainer