Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r35004 -r35006
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 35004)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 35006)
@@ -187,7 +187,7 @@
 	{name : 'washClassifyType'}
 ]});
 
-function setParentPrice(materialsJson){
+function setParentPrice(materialsJson,parentPrice){
 	var sumPrice = 0;
 	if(materialsJson.length > 0){
 		for(var k=0;k<materialsJson.length;k++){
@@ -203,9 +203,9 @@
 		}
 	}
 	if(sumPrice > 0){
-		return parseFloat(sumPrice).toFixed(2)
+		return (parseFloat(sumPrice)+parseFloat(parentPrice)).toFixed(2)
 	}else {
-		return sumPrice
+		return parentPrice
 	}
 }
 
@@ -1808,7 +1808,7 @@
 											var materialsJson = result.data[i].materials;
 											var price = '';
 											if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
-												sumPrice = setParentPrice(materialsJson);
+												sumPrice = setParentPrice(materialsJson,0);
 											}else {
 												sumPrice = result.data[i].price
 											}
@@ -2247,7 +2247,7 @@
 					currentRecord.set("tousseName",r[0].data.name);
 					if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
 						setTimeout(function(){
-							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes);
+							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes,currentRecord.parentNode.raw.price);
 							currentRecord.parentNode.set('price',sumPrice)
 						}, 200);
 					}
@@ -2330,7 +2330,7 @@
 				blur:function(field, event, eOpts){
 					if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
 						setTimeout(function(){
-							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes);
+							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes,currentRecord.parentNode.raw.price);
 							currentRecord.parentNode.set('price',sumPrice)
 						}, 200);
 					}
@@ -2562,6 +2562,17 @@
 			load:function(store,record){
 				if(record.childNodes.length > 0){
 					record.childNodes[0].set('checked',true)
+					if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
+						for(var i=0;i<record.childNodes.length;i++){
+							var sumPrice = 0;
+							for(var j=0;j<record.childNodes[i].childNodes.length;j++){
+								var price = parseFloat(record.childNodes[i].childNodes[j].data.price);
+								var amount = record.childNodes[i].childNodes[j].data.amount;
+								sumPrice += parseFloat(price*amount)
+							}
+							record.childNodes[i].raw.price = parseFloat(record.childNodes[i].data.price - sumPrice).toFixed(2);
+						}
+					}
 				}
 			}
 	    },