Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r30418 -r35824
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 30418)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 35824)
@@ -5,18 +5,56 @@
 
 //明细grid删除按钮
 function renderDeleteButton(v,p,record){
-	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteItem('"+record.data.materialDefinitionId+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
+	var tousseDefinitionId = record.data.tousseDefinitionId || ''
+	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteItem('"+record.data.materialDefinitionId+"','"+tousseDefinitionId+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
 }
 
+function setRowClass(){
+	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(map[materialDefinitionId]){
+			var oldAmount = parseInt(map[materialDefinitionId].amount);
+			if(nowStorage < (oldAmount+amount) || nowStorage == 0){
+				store.getAt([map[materialDefinitionId].index]).set('addClass',true);
+				store.getAt(i).set('addClass',true);
+			}else {
+				store.getAt(i).set('addClass',false);
+			}
+		}else {
+			var addClass = false;
+			if(nowStorage < amount || nowStorage == 0){
+				addClass = true
+			}
+			store.getAt(i).set('addClass',addClass);
+			map[materialDefinitionId] = {
+				index:i,
+				amount:amount
+			};
+		}
+	}
+}
+
 //删除grid明细
-function deleteItem(materialDefinitionId){
+function deleteItem(materialDefinitionId,tousseDefinitionId){
 	var materialGridStore = top.Ext.getCmp('materialInvoiceItemGrid').getStore();
 	for(var i = 0;i < materialGridStore.getCount();i++){
-		if(materialGridStore.getAt(i).data.materialDefinitionId == materialDefinitionId){
+		var newMaterialDefinitionId = materialGridStore.getAt(i).data.materialDefinitionId || '';
+		var newTousseDefinitionId = materialGridStore.getAt(i).data.tousseDefinitionId || '';
+		if(newMaterialDefinitionId == materialDefinitionId && newTousseDefinitionId == tousseDefinitionId){
 			materialGridStore.remove(materialGridStore.getAt(i));
 			break;
 		}
 	}
+	setRowClass();
 }
 //Ext.form.DateField在IE8下显示不全
 Ext.override(top.Ext.menu.Menu, {
@@ -247,7 +285,8 @@
 			amount : amount,
 			userecordId : userecordId,
 			userecordName : userecordName,
-			userecordDepartCoding : userecordDepartCoding
+			userecordDepartCoding : userecordDepartCoding,
+			nowStorage: storage
 		});
 		top.Ext.getCmp('materialInvoiceItemGrid').getStore().add(materialInvoiceItem);
 		top.Ext.getCmp('name1').setValue('');
@@ -258,6 +297,7 @@
 		top.Ext.getCmp('userecordName').setValue('');
 		top.Ext.getCmp('userecordDepartCoding').setValue('');
 		top.Ext.getCmp('name1').focus();
+		setRowClass();
 	}
 	
 	//添加明细(器械包材料)
@@ -293,10 +333,13 @@
 				return false;
 			}
 		}
+
+		var wareHouseId = top.Ext.getCmp('sourceWarehouseId').getValue();
+		
 		// 根据“器械包ID”查找“materialInvoiceItem”
 		Ext.Ajax.request({
 			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!findMaterialDefinitionByTousseDefinitionId.do',
-			params : {tousseDefinitionId : tousseDefinitionId},
+			params : {tousseDefinitionId : tousseDefinitionId,wareHouseId : wareHouseId},
 			async : false,
 			success : function(response, options) {
 				var result = Ext.decode(response.responseText);
@@ -318,10 +361,12 @@
 						userecordId : userecordId,
 						userecordName : userecordName,
 						userecordDepartCoding : userecordDepartCoding,
-						tousseName : tousseName
+						tousseName : tousseName,
+						nowStorage : data.storage
 					});
 					top.Ext.getCmp('materialInvoiceItemGrid').getStore().add(materialInvoiceItem);
 				}
+				setRowClass();
 			},
 			failure : function(form, action) {
 				showResult("查找器械包材料出错!");
@@ -563,6 +608,8 @@
 						{name : 'userecordName'},
 						{name : 'userecordDepartCoding'},
 						{name : 'amount'},
+						{name : 'nowStorage'},
+						{name : 'addClass'},
 						{name : 'deleteButton'}
 					]
 				})
@@ -571,27 +618,7 @@
 				{header : "id",dataIndex : 'id',hidden : true},
 				{header : "materialDefinitionId",dataIndex : 'materialDefinitionId',hidden : true},
 				{header : "器械包名称",dataIndex : 'tousseName',width : 50},
-				{header : "材料名称",dataIndex : 'materialName',width : 50,menuDisabled : true,
-					editor : new top.Ext.form.ComboBox({
-						queryParam : 'spell',
-						minChars : 0,
-						valueField : 'id',
-						displayField : 'displayName',
-						store : materialStore,
-						forceSelection : true,
-						lazyInit : false,
-						triggerAction : 'all',
-						hideTrigger : true,
-						typeAhead : false,
-						allowBlank : true,
-						width : 100,
-						listeners : {
-							select : function(combo, record, index) {
-								combo.setValue(record.data.name);
-							}
-						}
-					})
-				}, 
+				{header : "材料名称",dataIndex : 'materialName',width : 50,menuDisabled : true}, 
 				{header : "使用记录id",dataIndex : 'userecordId',hidden : true},
 				{header : "使用记录的科室编码",dataIndex : 'userecordDepartCoding',hidden : true},
 				{header : "使用记录",dataIndex : 'userecordName',width : 60/*,menuDisabled : true,
@@ -613,13 +640,14 @@
 					})*/
 				},
 				{header : "单价",width : 20,menuDisabled : true,dataIndex : 'singlePrice', id:'singlePrice', align:'center'},
-				{header : "&nbsp;数量",dataIndex : 'amount',width : 20,menuDisabled : true, align:'center',
+				{header : "数量",dataIndex : 'amount',width : 20,menuDisabled : true, align:'center',
 					editor : new Ext.form.TextField({
 						regex: /^[1-9]\d*$/,
 						regexText:'只能输入正整数',
 						allowBlank : false
 					})
 				},
+				{header : "当前库存",width : 20,menuDisabled : true,dataIndex : 'nowStorage', align:'center'},
 				{header : "删除",width : 20,menuDisabled : true,dataIndex : 'deleteButton', id:'expandColumn', renderer:renderDeleteButton}
 			]),
 			width : 910,
@@ -629,6 +657,21 @@
 			selModel : new top.Ext.grid.RowSelectionModel({
 				singleSelect : false
 			}),
+			viewConfig: {
+				forceFit:true,
+				//是否隔行换色
+				stripeRows: false,
+				getRowClass : function(record,rowIndex,rowParams,store){
+					if(record.data.addClass){
+						return 'storageRowClass'
+					}
+				}
+			},
+			listeners:{
+				afteredit: function(grid) { 
+					setRowClass()
+				}
+			},
 			tbar : [{
 				xtype : 'hidden',
 				name : 'toussedefinitionId',
@@ -833,6 +876,7 @@
 					jsonArray[len].userecordId = record.data.userecordId;
 					jsonArray[len].tousseName = record.data.tousseName;
 					jsonArray[len].tousseDefinitionId = record.data.tousseDefinitionId;
+					jsonArray[len].nowStorage = record.data.nowStorage;
 				}
 
 				top.Ext.getCmp("materialInvoiceItem").setValue(Ext.encode(jsonArray));
@@ -1082,7 +1126,8 @@
 					amount : action.result.data.materialInvoiceItemList[i].amount,
 					userecordId : action.result.data.materialInvoiceItemList[i].userecordId,
 					userecordName : action.result.data.materialInvoiceItemList[i].userecordName,
-					userecordDepartCoding : action.result.data.materialInvoiceItemList[i].userecordDepartCoding
+					userecordDepartCoding : action.result.data.materialInvoiceItemList[i].userecordDepartCoding,
+					nowStorage : action.result.data.materialInvoiceItemList[i].nowStorage
 				});
 				top.Ext.getCmp('materialInvoiceItemGrid').getStore().add(materialInvoiceItem);
 			}
Index: ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
===================================================================
diff -u -r35029 -r35824
--- ssts-web/src/main/webapp/ext/fontSize15/styles/common.css	(.../common.css)	(revision 35029)
+++ ssts-web/src/main/webapp/ext/fontSize15/styles/common.css	(.../common.css)	(revision 35824)
@@ -480,4 +480,10 @@
 
 #configForm-body .x4-panel-body-default {
     background: none !important;
+}
+
+/* DGSETYY-64：若材料的库存数量少于当前发货数量，则将该行数据的背景颜色更改为红色，文字颜色更改为白色*/
+.storageRowClass {
+	background: red !important;
+    color: #fff !important;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
===================================================================
diff -u -r34649 -r35824
--- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 34649)
+++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 35824)
@@ -568,4 +568,10 @@
     overflow: auto;
     background: none;
     border: 0;
+}
+
+/* DGSETYY-64：若材料的库存数量少于当前发货数量，则将该行数据的背景颜色更改为红色，文字颜色更改为白色*/
+.storageRowClass {
+	background: red !important;
+    color: #fff !important;
 }
\ No newline at end of file