Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r15922 -r15931
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 15922)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 15931)
@@ -1163,6 +1163,8 @@
 						String name = disposableGoodsStock.getShowNameForSmallestUnit();
 						Long amount = disposableGoodsStock.getAmount();
 						storage.put("name", name);
+						storage.put("disposableGoodsStockId", disposableGoodsStock.getId());
+						storage.put("disposableGoodsId", disposableGoodsStock.getDisposableGoodsID());
 						DisposableGoods disposableGoods = disposableGoodsMap.get(disposableGoodsStock.getDisposableGoodsID());
 						Integer transferScale = disposableGoods.getTransferScale();
 						
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r15899 -r15931
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15899)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15931)
@@ -665,7 +665,7 @@
 	if(storages.length > 0){
 		for ( var i = 0; i < storages.length; i++) {
 			var storage = storages[i];
-			var record = findRecordByNameAndValueFromStore(recyclingapplicationStore,'name',storage.name);
+			var record = findAppRecordByStorageInfo(storage);
 			if(record){
 //				if(!isUndefinedOrNull(storage.middlePackageStorage)){
 //					record.set('storage',storage.storage);
@@ -677,6 +677,20 @@
 		}
 	}
 }
+function findAppRecordByStorageInfo(storage){
+	for(var i=0;i<recyclingapplicationStore.getCount();i++){
+		var disposableGoodsId = storage.disposableGoodsId;
+		var record = recyclingapplicationStore.getAt(i);
+		var disposableGoodsIdSet = record.data.disposableGoodsIdSet;
+		for(var d=0;d<disposableGoodsIdSet.length;++d){
+			if(disposableGoodsIdSet[d] == disposableGoodsId){
+				return record;
+			}
+		}
+		
+	}
+	return undefined;
+}
 function middlePackageAmountValid(middlePackageAmount){
 	if(!isUndefinedOrNull(middlePackageAmount) && middlePackageAmount > 0){
 		return true;