Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r20065 -r20102
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 20065)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 20102)
@@ -19,7 +19,7 @@
 	packingBtnText = "装配无菌物品";
 }
 var packingPageAutoSetSterilizationProgramAfterSelectTousse = true;
-
+var taskGroupObj = null;
 //丢失报损按钮响应函数
 var onErrorDamageBtnClick = null;
 
@@ -144,6 +144,7 @@
 }
 
 Ext4.onReady(function() {
+	taskGroupObj = getTaskGroupObjByName(taskGroup);
 	packingPageAutoSetSterilizationProgramAfterSelectTousse = getBoolValueFromJs('sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse',true);
 	Ext4.QuickTips.init();
 	Ext4.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
@@ -2466,7 +2467,13 @@
 	Ext4.getCmp('packingLableBtn').enable();
 	
 	hidePackingTousseBtnClick_mask();
-	Ext4.getCmp('basketBarcodeInput').focus('', 10);
+	// 根据装配组的配置来设置光标
+	if(taskGroupObj && taskGroupObj.cursorFieldAfterPacking && taskGroupObj.cursorFieldAfterPacking == '标识牌条码'){
+		Ext4.getCmp('scanIdCardBarcode').focus('', 10);
+	}else{
+		Ext4.getCmp('basketBarcodeInput').focus('', 10);
+	}
+	
 }
 function showPackingTousseBtnClick_mask(){
 	packingTousseBtnClick_mask = new Ext4.LoadMask({msg:"正在装配，请稍候...",target:Ext4.getCmp('packingViewTab0')});
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/taskGroup/TaskGroup.java
===================================================================
diff -u -r13416 -r20102
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/taskGroup/TaskGroup.java	(.../TaskGroup.java)	(revision 13416)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/taskGroup/TaskGroup.java	(.../TaskGroup.java)	(revision 20102)
@@ -31,6 +31,10 @@
 	private String taskGroupName;
 	private String departName;
 	private String departCode;
+	/**
+	 * 装配后光标定位的域
+	 */
+	private String cursorFieldAfterPacking = "蓝框条码"; 
 	public static Map<String, String> ColumnNameAndPoPropertyNameMap = new LinkedHashMap<String, String>(
 			3);
 	
@@ -75,6 +79,14 @@
 	public void setDepartCode(String departCode) {
 		this.departCode = departCode;
 	}
+	public String getCursorFieldAfterPacking() {
+		return cursorFieldAfterPacking;
+	}
+	public void setCursorFieldAfterPacking(String cursorFieldAfterPacking) {
+		if(cursorFieldAfterPacking != null){
+			this.cursorFieldAfterPacking = cursorFieldAfterPacking;
+		}
+	}
 	
 	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r19066 -r20102
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 19066)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 20102)
@@ -274,7 +274,7 @@
 </script>
 
 <%@ include file="/disinfectsystem/print/print.jsp"%>
-	
+<script type="text/javascript" src="${ctx}/dwr/interface/TaskGroupTableManager.js"></script>	
 <script>
 $LAB
 	.script("packingView.js")
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r19982 -r20102
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 19982)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 20102)
@@ -629,4 +629,16 @@
 	field.disable();// for validation
 	field.hide();
 	field.getEl().up('.x-form-item').setDisplayed(false); // hide label
+}
+
+function getTaskGroupObjByName(taskGroupName){
+	var obj = null;
+	DWREngine.setAsync(false);
+	TaskGroupTableManager.getTaskGroupByName(taskGroupName, function(result) {
+		if (result != null) {
+			obj = JSON.parse(result);
+		}
+	});
+	DWREngine.setAsync(true);
+	return obj;
 }
\ No newline at end of file
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/dwr/TaskGroupTableManager.java
===================================================================
diff -u -r17849 -r20102
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/dwr/TaskGroupTableManager.java	(.../TaskGroupTableManager.java)	(revision 17849)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/taskGroup/dwr/TaskGroupTableManager.java	(.../TaskGroupTableManager.java)	(revision 20102)
@@ -3,21 +3,41 @@
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONObject;
+
 import com.forgon.component.grid.GridManager;
 import com.forgon.disinfectsystem.basedatamanager.taskGroup.service.TaskGroupManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup;
 
 public class TaskGroupTableManager {
 
 	private GridManager gridManager;
-
+	private TaskGroupManager taskGroupManager;
 	public void setGridManager(GridManager gridManager) {
 		this.gridManager = gridManager;
 	}
 	
+	public void setTaskGroupManager(TaskGroupManager taskGroupManager) {
+		this.taskGroupManager = taskGroupManager;
+	}
+
 	public String findTaskGroupTablList(Map<String, List<String>> parameterMap){
 		String renderGrid = gridManager.renderGrid(parameterMap, 
 				TaskGroup.class.getSimpleName(), "", new String[]{});
 		return renderGrid;
 	}
+	
+	public String getTaskGroupByName(String taskGroupName){
+		JSONObject obj = new JSONObject();
+		if(taskGroupName != null){
+			TaskGroup taskGroup = taskGroupManager.getTaskGroup(taskGroupName);
+			if(taskGroup != null){
+				obj.put("taskGroupName", taskGroup.getTaskGroupName());
+				obj.put("cursorFieldAfterPacking", taskGroup.getCursorFieldAfterPacking());
+			}
+		}
+		
+		return obj.toString();
+		
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupForm.js
===================================================================
diff -u -r12331 -r20102
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupForm.js	(.../taskGroupForm.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/taskGroup/taskGroupForm.js	(.../taskGroupForm.js)	(revision 20102)
@@ -33,7 +33,7 @@
 		}, {
 			layout : 'column',
 			items : [ {
-				columnWidth : 0.5,
+				columnWidth : 0.4,
 				layout : 'form',
 				labelWidth:60,
 				items : [{
@@ -45,7 +45,7 @@
 						anchor : '95%'
 					}]
 				},{
-					columnWidth : 0.5,
+					columnWidth : 0.3,
 					layout : 'form',
 					labelWidth : 70,
 					items : [{
@@ -67,7 +67,30 @@
 							}
 						}
 					}]
-			}]
+			},{
+			    columnWidth : .3,
+			    layout : 'form',
+			    labelWidth : 80,
+			    items:[{
+					xtype : 'combo',
+					fieldLabel : '是否整包申请',
+					id : 'cursorFieldAfterPacking',
+					name : 'cursorFieldAfterPacking',
+					editable:false,
+					valueField : 'value',
+					displayField : 'value',
+					allowBlank : true,
+					value : '蓝框条码',
+					store : new Ext.data.SimpleStore({
+						fields : [ 'value' ],
+						data : [['蓝框条码'],[ '标识牌条码']]
+					}),
+					forceSelection : true,
+					mode : 'local',
+					triggerAction : 'all',
+					anchor : '100%'
+				}]
+	       }]
 		} ],
 		buttons : [{
 			id : 'saveBtn',
@@ -85,7 +108,7 @@
 		id : 'taskGroupWin',
 		layout : 'fit',
 		title : '任务组信息',
-		width : 450,
+		width : 700,
 		border : false,
 		modal : true,
 		autoHeight : true,