Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r15918 -r15938
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 15918)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js	(.../diposableGoodsView.js)	(revision 15938)
@@ -676,6 +676,10 @@
 				var applicationSpecification = top.Ext.getCmp("applicationSpecification").getValue();
 				var msg = '';
 				var id = top.Ext.getCmp('id').getValue();
+				// 规格不为空且和申领规格相等,提示
+				if( !isUndefinedOrNullOrEmpty(specification) && stringLooksEquals(specification,applicationSpecification)){
+					msg = "是否确定规格和申领规格相同？";
+				}
 				if(id != null && id != ''){
 					if(!stringLooksEquals(orginalName,name) && (!stringLooksEquals(orginalSpecification,specification) || !stringLooksEquals(orginalApplicationSpecification,applicationSpecification))){
 						msg = "是否确定修改一次性物品名称和规格？"
@@ -685,6 +689,7 @@
 						msg = "是否确定修改一次性物品规格？"
 					}
 				}
+				
 //				if(!stringLooksEquals(originalGoodsType,goodsType)){
 //					msg += "是否确定更改物品类型？"
 //				}
@@ -727,6 +732,15 @@
 			return false;
 		}
 	}
+	var transferScale = top.Ext.getCmp('transferScale').getValue();
+	if(transferScale != null){
+		if(transferScale <= 0){
+			showResult("申领单位转换系数必须大于0！");
+			top.Ext.getCmp('transferScale').setValue("");
+			top.Ext.getCmp('transferScale').focus();
+			return false;
+		}
+	}
 	
 	var max = top.Ext.getCmp('maxStorage').getValue();
 	var min = top.Ext.getCmp('minStorage').getValue();
@@ -745,10 +759,11 @@
 		}
 	}
 	var middlePackageUnit = top.Ext.getCmp('middlePackageUnit').getValue();
-	var transferScale = top.Ext.getCmp('transferScale').getValue();
-	if ((isUndefinedOrNullOrEmpty(middlePackageUnit) && !isUndefinedOrNullOrEmpty(transferScale)) ||
-		(!isUndefinedOrNullOrEmpty(middlePackageUnit) && isUndefinedOrNullOrEmpty(transferScale))){
-		showResult('中包装单位和中包装单位装换单位系数必须同时有值或者同时为空!');
+	var applicationSpecification = top.Ext.getCmp("applicationSpecification").getValue();
+	if ( !((isUndefinedOrNullOrEmpty(middlePackageUnit) && isUndefinedOrNullOrEmpty(transferScale) && isUndefinedOrNullOrEmpty(applicationSpecification)) ||
+		 (!isUndefinedOrNullOrEmpty(middlePackageUnit) && !isUndefinedOrNullOrEmpty(transferScale) && !isUndefinedOrNullOrEmpty(applicationSpecification))
+		 )){
+		showResult('申领规格、申领单位和申领单位装换单位系数必须同时有值或者同时为空!');
 		return false;
 	}
 	this.disable();
@@ -979,8 +994,8 @@
 		{header : "最小申请数量",width : 80,dataIndex : 'minApplyAmount'},
 		{header : "最大申请数量",width : 80,dataIndex : 'maxApplyAmount'},
 		{header : "单位",width : 50,dataIndex : 'unit'},
-		{header : "中包装单位",width : 90,dataIndex : 'middlePackageUnit'},
-		{header : "中包装单位装换单位系数",width : 90,dataIndex : 'transferScale'},
+		{header : "申领单位",width : 90,dataIndex : 'middlePackageUnit'},
+		{header : "申领单位转换单位系数",width : 90,dataIndex : 'transferScale'},
 		{header : "顺序号",width : 50,dataIndex : 'sequence'},
 		{header : "拼音码",width : 90,dataIndex : 'spelling'},
 		{header : "五笔码",width : 90,dataIndex : 'wbCode'},