Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r26030 -r26064
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 26030)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 26064)
@@ -1,5 +1,7 @@
 var entityName = "材料发货管理";
 var grid;
+//是否批量打印进入的print，从而是否控制材料出库单打印的金额和数量是否右对齐
+var isPrintForGoodsWithBtn;
 
 //明细grid删除按钮
 function renderDeleteButton(v,p,record){
@@ -497,6 +499,7 @@
 						top.Ext.getCmp('materialDefinitionId').setValue(record.data.id);
 						top.Ext.getCmp('storage').setValue(record.data.storage);
 						top.Ext.getCmp('cost').setValue(record.data.cost);
+						top.Ext.getCmp('amount1').focus(false, 100);
 					},
 					specialkey : function(field, ee) {
 						if (ee.getKey() == Ext.EventObject.ENTER) {
@@ -996,6 +999,7 @@
         text : '批量打印',
         iconCls : 'icon_print',
         handler : function() {
+        	isPrintForGoodsWithBtn = true;
         	mergePrintInvoices();
         }
     }];