Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js
===================================================================
diff -u -r12758 -r12797
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12758)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js	(.../godownOutView.js)	(revision 12797)
@@ -1,7 +1,8 @@
 var entityName = "退库单管理";
 var grid;
 var g_localID = 1;// 为了区分每一个item，增加的ID。
-var entryid = '';
+var commonEntry = new commonEntry();
+
 //单价数据源
 var priceStore = null;
 var PriceRecord = null;
@@ -76,7 +77,7 @@
 	]),
 	listeners : {
 		load : function(store,records) {
-			if(records.length > 0 && (entryid == null || entryid == '')){
+			if(records.length > 0 && (!commonEntry.isOpen())){
 				var combo = top.Ext.getCmp("wareHouse1");
 				// 触发选中事件
 				combo.fireEvent('select', combo,records[0],0);
@@ -358,6 +359,7 @@
 							setWareHouseInfo(record.data.id,record.data.name);
 							top.Ext.getCmp('wareHouse1').setValue(record.data.id);
 							top.Ext.getCmp('name1').focus();
+							top.Ext.getCmp('name1').enable();
 						},
 						specialkey : function(field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
@@ -489,6 +491,7 @@
 				hideTrigger : true,
 				typeAhead : false,
 				allowBlank : true,
+				disabled : true,
 				width : 180,
 				listeners : {
 					select : function(combo, record, index) {
@@ -499,9 +502,9 @@
 						
 						// 清空批次和价格
 						clearBatchNumberAndPrice();
-						
+						var wareHouseid = top.Ext.getCmp('warehouseID').getValue();
 //						DiposableGoodsTableManager.getBatchNumbersByDiposableGoodsId(record.data.id,"inStock",function(batchNumbers){
-						DiposableGoodsTableManager.getBatchsByDiposableGoodsId(record.data.id,false,function(batchesStr){
+						DiposableGoodsTableManager.getBatchsByDiposableGoodsId(record.data.id,wareHouseid,false,function(batchesStr){
 							var batches = JSON.parse(batchesStr);
 //							alert(batchesStr)
 							for(var i = 0;i<batches.length;i++){
@@ -730,6 +733,7 @@
 };
 
 function editRecord(id){
+	commonEntry.setId(id);
 	addGodownEntry();
 	top.Ext.getCmp("serialNum").show();
 	top.Ext.getCmp('godownEntryForm').form.load({
@@ -841,6 +845,7 @@
 		hidden : SSTS_WarehouseEntry_Create,
 		iconCls : 'btn_ext_add',
 		handler : function() {
+			commonEntry.setId(null);
 			addGodownEntry('insert');
 		}
 	},'-',{
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r12761 -r12797
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12761)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 12797)
@@ -2,7 +2,7 @@
 var grid;
 var batchNumStore;
 var g_localID = 1;// 为了区分每一个item，增加的ID。
-var entryid = '';
+var commonEntry = new commonEntry();
 
 var wareHouseStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -19,7 +19,7 @@
 	]),
 	listeners : {
 		load : function(store,records) {
-			if(records.length > 0 && (entryid == null || entryid == '')){
+			if(records.length > 0 && (!commonEntry.isOpen())){
 				var combo = top.Ext.getCmp("wareHouse1");
 				// 触发选中事件
 				combo.fireEvent('select', combo,records[0],0);
@@ -412,6 +412,7 @@
 							});*/
 
 							top.Ext.getCmp('name1').focus();
+							top.Ext.getCmp('name1').enable();
 						},
 						specialkey : function(field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
@@ -629,6 +630,7 @@
 				width : 270,
 				tabIndex : 1,
 				selectOnFocus : true,
+				disabled:true,
 				listeners : {
 					select : function(combo, record, index) {
 						top.Ext.getCmp('name1').setValue(record.data.name);
@@ -1341,7 +1343,7 @@
 	editRecord(id);
 };
 function editRecord(id){
-	entryid = id;
+	commonEntry.setId(id);
 	addGodownEntry();
 	top.Ext.getCmp("serialNum").show();
 	top.Ext.getCmp('godownEntryForm').form.load({
@@ -1445,6 +1447,7 @@
 		hidden : SSTS_WarehouseEntry_Create,
 		iconCls : 'btn_ext_application_add',
 		handler : function() {
+			commonEntry.setId(null);
 			addGodownEntry('insert');
 		}
 	}, '-', {
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp
===================================================================
diff -u -r12532 -r12797
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp	(.../godownEntryView.jsp)	(revision 12532)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp	(.../godownEntryView.jsp)	(revision 12797)
@@ -29,6 +29,7 @@
 var madeCompany = '<%=Supplier.SUPPLIER_TYPE_MADECOMPANY%>';//生产厂家
 var supplier = '<%=Supplier.SUPPLIER_TYPE_SUPPLIER%>';//供货单位
 </script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/assestManagement/godownEntry/commonEntry.js"></script>
 <script type="text/javascript" src="godownEntryView.js"></script>
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp
===================================================================
diff -u -r12331 -r12797
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp	(.../godownOutView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.jsp	(.../godownOutView.jsp)	(revision 12797)
@@ -21,6 +21,7 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/DiposableGoodsTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/assestManagement/godownEntry/commonEntry.js"></script>
 <script type="text/javascript" src="godownOutView.js"></script>
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>