Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java
===================================================================
diff -u -r19309 -r19351
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 19309)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java	(.../MaterialDefinitionManagerImpl.java)	(revision 19351)
@@ -612,7 +612,7 @@
 			}
 			if(CollectionUtils.isNotEmpty(warehouseIds)){
 				String wareHousePredicate = SqlUtils.getNonStringFieldInCollectionsPredicate("gs.wareHouseId", warehouseIds);
-				String materialSql = "select md.id,md.name,md.specification,md.disable,md.isForeignMaterial,md.externalCode,md.cost,gs.amount as storage,md.inventorySerialNumber  "
+				String materialSql = "select md.id,md.name,md.specification,md.disable,md.isForeignMaterial,md.externalCode,md.cost,md.inventorySerialNumber,gs.amount as storage  "
 						+ "from MaterialDefinition md left join (select materialDefinitionId , wareHouseId ,sum(amount) as amount from goodsstock where materialDefinitionId is not null and materialDefinitionId<>0 group by wareHouseId,materialDefinitionId ) gs on md.id=gs.materialDefinitionId and " + wareHousePredicate;
 				materialSql += " where 1=1 ";
 				if(StringUtils.isNotBlank(simpleSpell)){
Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
===================================================================
diff -u -r19313 -r19351
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 19313)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 19351)
@@ -505,7 +505,7 @@
 					},
 					specialkey : function(field, e) {
 						if (e.getKey() == Ext.EventObject.ENTER) {
-							top.Ext.getCmp('inventorySerialNumber').focus();
+							top.Ext.getCmp('amount1').focus();
 						}
 					}
 				}
@@ -617,7 +617,7 @@
 								listeners : {
 									specialkey : function(field, e) {
 										if (e.getKey() == Ext.EventObject.ENTER) {
-											top.Ext.getCmp('amount1').focus();
+											top.Ext.getCmp('certification').focus();
 										}
 									}
 								}