Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r35824 -r35838
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 35824)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 35838)
@@ -9,18 +9,27 @@
 	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteItem('"+record.data.materialDefinitionId+"','"+tousseDefinitionId+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
 }
 
-function setRowClass(){
+function setRowClass(materialStock){
 	var store = top.Ext.getCmp('materialInvoiceItemGrid').getStore();
 	var map = {}
 	for(var i=0;i<store.getCount();i++){
 		var item = store.getAt(i);
-		var nowStorage = item.data.nowStorage || 0;
-		var amount = parseInt(item.data.amount || 0);
-		var materialDefinitionId = parseInt(item.data.materialDefinitionId);
 		var id = item.data.id;
 		if(id !== ''){
 			break;
 		}
+		if(materialStock){
+			for(var j=0;j<materialStock.length;j++){
+				var newMaterialDefinitionId = materialStock[j].materialDefinitionId;
+				var storage = materialStock[j].nowStorage;
+				if(newMaterialDefinitionId == item.data.materialDefinitionId && storage !== item.data.nowStorage){
+					store.getAt(i).set('nowStorage',storage);
+				}
+			}
+		}
+		var nowStorage = item.data.nowStorage || 0;
+		var amount = parseInt(item.data.amount || 0);
+		var materialDefinitionId = parseInt(item.data.materialDefinitionId);
 		if(map[materialDefinitionId]){
 			var oldAmount = parseInt(map[materialDefinitionId].amount);
 			if(nowStorage < (oldAmount+amount) || nowStorage == 0){
@@ -895,7 +904,12 @@
 
 					},
 					failure : function(form, action) {
-						showResult(action.result.message);
+						if(action.result.materialStock){
+							showResult(action.result.message);
+							setRowClass(action.result.materialStock);
+						}else {
+							showResult(action.result.message);
+						}
 					}
 				});
 			}