Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r15437 -r15510
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 15437)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 15510)
@@ -59,6 +59,7 @@
 <script type="text/javascript" src="invoicePlanExtractedForm.js"></script>
 
 <script type="text/javascript">
+	var project = '${profile}';
     var SSTS_DeviceMaintenance_Create = true;
     <operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Create">
     SSTS_DeviceMaintenance_Create = false;
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r15437 -r15510
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 15437)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 15510)
@@ -1,5 +1,6 @@
 var grid;
-
+var INVOICE_FORM_OPEN_MODE_CLICKITEM = 'clickItem';
+var INVOICE_FORM_OPEN_MODE_SCANBARCODE = 'barcode';
 /**
  * 刷新列表
  * @param isSetDateValue 是否要设置开始时间和结束时间
@@ -54,11 +55,14 @@
 	}
 	var departCode = records[0].data['departCode'];
 	var depart = records[0].data['depart'];
+	openMode = INVOICE_FORM_OPEN_MODE_CLICKITEM;
 	addAndEditInvoicePlan(departCode,depart);
 }
 /**
  * 通过扫描条码打开发货计划单。条码可以是科室条码(不是科室编码)，也可以是单号
  */
+var openMode = INVOICE_FORM_OPEN_MODE_CLICKITEM;
+
 function openInvoicePlanByBarcode(barcode){
 	if(isUndefinedOrNullOrEmpty(barcode)){
 		showResult("请扫描科室条码或申请单条码");
@@ -71,6 +75,7 @@
 			var result = Ext.decode(response.responseText);
 			if(result){
 				if(result.success){
+					openMode = INVOICE_FORM_OPEN_MODE_SCANBARCODE;
 					addAndEditInvoicePlan(result.data.departCode,result.data.depart,result.data.invoicePlanId);
 					showResult(result.data.depart + "的发货单");
 				}else{
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r15509 -r15510
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15509)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15510)
@@ -1417,7 +1417,21 @@
 	});
 
 	window.show();
-	top.Ext.getCmp(defaultFocusedFieldOnInvoiceForm).focus(false, 100);
+	if(project == 'gdsy'){
+		if(openMode == INVOICE_FORM_OPEN_MODE_SCANBARCODE){
+			var sender = top.Ext.getCmp('sender').getValue();
+			if(isUndefinedOrNullOrEmpty(sender)){
+				top.Ext.getCmp('senderBarcode').focus(false, 100);
+			}else{
+				top.Ext.getCmp('personInChargeBarcode').focus(false, 100);
+			}
+		}else{
+			top.Ext.getCmp('senderBarcode').focus(false, 100);
+		}
+	}else{
+		top.Ext.getCmp(defaultFocusedFieldOnInvoiceForm).focus(false, 100);
+	}
+	
 //	top.Ext.getCmp('senderBarcode').focus(false, 100);
 	
 	var sendOutGoodsDetailGrid = top.Ext.getCmp('sendOutGoodsDetail');