Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r29040 -r29176
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 29040)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 29176)
@@ -361,6 +361,7 @@
 		obj.sterilingType = record.get('sterilingType');
 		obj.basketName = record.get('basketName');
 		obj.basketBarcode = record.get('basketBarcode');
+		obj.departCoding = record.get('departCoding');
 		var sterileStartDate = record.get('sterileStartDate');
 		if(typeof sterileStartDate == 'object'){
 			sterileStartDate = sterileStartDate.format('Y-m-d')
@@ -379,6 +380,8 @@
 	var sterilingType = top.Ext.getCmp('sterilingType1').getValue();
 	var sterileStartDate = top.Ext.getCmp('sterileStartDate1').getValue();
 	var basketName = top.Ext.getCmp('basketName').getValue();
+	var depart = top.Ext.getCmp('depart').getValue();
+	var departCoding = top.Ext.getCmp('departCoding').getValue();
 	if(mustScanBasketForForeignProxy && basketName!=null && basketName.trim().length==0){
 		showResult("请先扫描灭菌筐!"); 
 		return;
@@ -396,8 +399,11 @@
 	}else if(count == ""){
 		showResult("请输入数量,数量必须大于0!");
 		top.Ext.getCmp('count1').focus();
+	}else if(depart == ""){
+		showResult("请先填写申请科室！");
+		top.Ext.getCmp('depart').focus();
 	}else{
-		addItemToGrid(top.Ext.getCmp('package1').getRawValue(),count,packageType,sterilingType,sterileStartDate,top.Ext.getCmp('basketName').getValue(),top.Ext.getCmp('basketBarcode1').getValue(),top.Ext.getCmp('tousseType1').getValue());
+		addItemToGrid(top.Ext.getCmp('package1').getRawValue(),count,packageType,sterilingType,sterileStartDate,top.Ext.getCmp('basketName').getValue(),top.Ext.getCmp('basketBarcode1').getValue(),top.Ext.getCmp('tousseType1').getValue(),depart,departCoding);
 		//光标操作
 		top.Ext.getCmp('package1').setValue("");
 		top.Ext.getCmp('tousseType1').setValue("");
@@ -544,6 +550,48 @@
 			dataIndex : 'id',
 			hidden : true
 		},{
+			id : 'itemDepartCoding',
+			dataIndex : 'itemDepartCoding',
+			hidden : true
+		},{
+			id : 'departCodingName',
+			header : "申请科室",
+			dataIndex : 'departCodingName',
+			width : 200,
+			menuDisabled: true,
+			hidden:id,
+			editor : new top.Ext.form.ComboBox({
+				xtype : 'combo',
+				fieldLabel : '申请科室',
+				id : 'departCodingBox',
+				name : 'departCodingBox',
+				queryParam : 'spell',
+				valueField : 'id',
+				displayField : 'name',
+				store : appDepartJsonStore,
+				forceSelection : true,
+				lazyInit : false,
+				triggerAction : 'all',
+				hideTrigger : false,
+				typeAhead : false,
+				allowBlank : false,
+				anchor : '97%',
+				listeners:{
+					select:function(combo, record, index){
+						combo.setValue(record.data.name);
+						setTimeout(function(){
+							for(var i=0,len=foreignItemStore.getCount(); i<len; i++){
+								var records = foreignItemStore.getAt(i);
+								if(selectModel.selections.items[0].data.tousseName == records.data.tousseName){
+									records.set('departCoding',record.data.id);
+									records.set('departCodingName',record.data.name);
+								}
+							}
+						}, 500);
+					}
+				}
+			})
+		},{
 			header : "物品",
 			dataIndex : 'tousseName',
 			width : 180,
@@ -1407,10 +1455,10 @@
 							params : {printTousse :true},
 							success : function(form, action) {
 								if(action.result.success){
-									id = action.result.foreignProxyDisinfection.id;
-									//打印条码
-									printBarcode(action.result);
-//									disableButtonsAfterPacking();
+									for(var i=0;i<action.result.printInfoArray.length;i++){
+										printBarcode(action.result.printInfoArray[i]);
+										id = action.result.printInfoArray[i].foreignProxyDisinfection.id;
+									}
 								}else{
 									showResult(action.result.msg);
 								}
@@ -2074,7 +2122,7 @@
 }
 
 //tousseName, packageType, sterileType 当三项同时存在某一个记录里isExist才是true
-function checkItemIsRepeat(tousseName, packageType, sterilingType,basketBarcode, currentRecordId){
+function checkItemIsRepeat(tousseName, packageType, sterilingType,basketBarcode, currentRecordId,departCoding){
 	var isExist = false;
 	for(var i=0,len=foreignItemStore.getCount(); i<len; i++){
 		var record = foreignItemStore.getAt(i);
@@ -2092,8 +2140,8 @@
 	return isExist;
 }
 
-function addItemToGrid(tousseName,count,packageType,sterilingType,sterileStartDate,basketName,basketBarcode,tousseType){
-	if(checkItemIsRepeat(tousseName, packageType, sterilingType,basketBarcode, '')){
+function addItemToGrid(tousseName,count,packageType,sterilingType,sterileStartDate,basketName,basketBarcode,tousseType,depart,departCoding){
+	if(checkItemIsRepeat(tousseName, packageType, sterilingType,basketBarcode, '',departCoding)){
 		showResult("此记录项在"+entityName+"单明细中已存在");
 		return;
 	}
@@ -2107,7 +2155,9 @@
 		tousseType : tousseType,
 		sterilingType : sterilingType,
 		sterileStartDate : sterileStartDate,
-		packageType : packageType 
+		packageType : packageType,
+		departCodingName : depart,
+		departCoding : departCoding
 	});
 	foreignItemStore.add(tousseInstance);
 }