Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r15510 -r15522
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15510)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15522)
@@ -1049,6 +1049,8 @@
 									                showResult("输入的条码有误！");
 									                return;
 									            }
+									            Ext.state.Manager.getProvider().set('cookiePersonInCharge',result.fullName);
+									            Ext.state.Manager.getProvider().set('cookiePersonInChargeCode',result.name);
 									            top.Ext.getCmp('personInCharge').setValue(result.fullName);
 									            top.Ext.getCmp('personInChargeCode').setValue(result.name);
 									            top.Ext.getCmp('scanText').focus();
@@ -1397,7 +1399,15 @@
 	if(cookieSender){
 		top.Ext.getCmp('sender').setValue(cookieSender);
 	}
-
+	var cookiePersonInCharge = Ext.state.Manager.getProvider().get('cookiePersonInCharge');
+	var cookiePersonInChargeCode = Ext.state.Manager.getProvider().get('cookiePersonInChargeCode');
+	if(cookiePersonInCharge){
+		top.Ext.getCmp('personInCharge').setValue(cookiePersonInCharge);
+	}
+	if(cookiePersonInChargeCode){
+		top.Ext.getCmp('personInChargeCode').setValue(cookiePersonInChargeCode);
+	}
+	
 	var window = new top.Ext.Window( {
 		id : 'recyclingApplicationWin',
 		layout : 'fit',
@@ -1420,10 +1430,15 @@
 	if(project == 'gdsy'){
 		if(openMode == INVOICE_FORM_OPEN_MODE_SCANBARCODE){
 			var sender = top.Ext.getCmp('sender').getValue();
+			var personInCharge = top.Ext.getCmp('personInCharge').getValue();
 			if(isUndefinedOrNullOrEmpty(sender)){
 				top.Ext.getCmp('senderBarcode').focus(false, 100);
 			}else{
-				top.Ext.getCmp('personInChargeBarcode').focus(false, 100);
+				if(isUndefinedOrNullOrEmpty(personInCharge)){
+					top.Ext.getCmp('personInChargeBarcode').focus(false, 100);
+				}else{
+					top.Ext.getCmp('scanText').focus(false, 100);
+				}
 			}
 		}else{
 			top.Ext.getCmp('senderBarcode').focus(false, 100);