Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js
===================================================================
diff -u -r36956 -r37046
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js	(.../config.js)	(revision 36956)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js	(.../config.js)	(revision 37046)
@@ -197,6 +197,8 @@
   enableDisplaysTheItemInformationOfPDAInvoice:true,
   //仅显示可发货的发货计划
   onlyAvailableIsDisplayedOfInvoicePlanList:true,
+  //辅助发货功能的扩展查询项
+  ExtendedQueryItemsOfAuxiliaryInvoice:["itemOrigin"],
   //用来控制发货计划模块的待发货物品颜色变化规则
   colorChangeRuleOfInvoicPlanToSendGoodsList:2
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
===================================================================
diff -u -r36788 -r37046
--- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 36788)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 37046)
@@ -111,7 +111,8 @@
 		    {name : 'errorAmount'},
 		    {name : 'storage'},
 		    {name : 'amount'},
-		    {name : 'status'},
+		    {name : 'depart'},
+			{name : 'status'},
 		    {name : 'sterileStartTime'},
 		    {name : 'sterileStartDate'},
 		    {name : 'sterileEndTime'},
@@ -175,10 +176,15 @@
 			}
 		}
 	});
+
+	var itemOriginBoxShow = false;
+	//SZSLGZXYY-21：物品来源科室
+	if(sstsConfig.ExtendedQueryItemsOfAuxiliaryInvoice && sstsConfig.ExtendedQueryItemsOfAuxiliaryInvoice.indexOf('itemOrigin') >= 0){
+		itemOriginBoxShow = true;
+	}
 	
 	recyclingapplicationStore.removeAll();
 	recyclingapplicationStore.on("beforeload", function(thiz, options) {
-		thiz.baseParams["orgUnitCoding"] = orgUnitCoding;
 		var sterileStartTime = '';
 		var sterileEndTime = '';
 		var query_startDate = top.Ext.getCmp('query_startDate');
@@ -200,6 +206,20 @@
 			tousseTypes = sstsConfig.auxiliaryInvoiceTousseTypes;
 		}
 		recyclingapplicationStore.baseParams['tousseTypes'] = tousseTypes;
+		//SZSLGZXYY-21：物品来源科室
+		if(itemOriginBoxShow){
+			var itemOrigin = '';
+			if(top.Ext.getCmp("itemOrigin")){
+				itemOrigin = top.Ext.getCmp("itemOrigin").getValue();
+			}
+			if(itemOrigin == '所有科室'){
+				thiz.baseParams["orgUnitCoding"] = '';
+			}else {
+				thiz.baseParams["orgUnitCoding"] = orgUnitCoding;
+			}
+		}else {
+			thiz.baseParams["orgUnitCoding"] = orgUnitCoding;
+		}
 	});
 	
 //	sendOutGoodsStore.removeAll();
@@ -210,8 +230,9 @@
 	var selectModel = new top.Ext.grid.CheckboxSelectionModel();
 	var	recyclingapplicationCm = new Ext.grid.ColumnModel([selectModel,
 //	   	{header : "id",id : 'id',dataIndex : 'id',width : 50,hidden : true,menuDisabled: true},
-	   	{header : "条码",dataIndex : 'barcode',width : 120,menuDisabled: true},                                                   
+	   	{header : "条码",dataIndex : 'barcode',width : 120,menuDisabled: true},            
         {header : "名称",id : 'showTousseName',dataIndex : 'showTousseName',width : 150,menuDisabled: true},
+		{header : "来源科室",dataIndex : 'depart',width : 80,menuDisabled: true,hidden:!itemOriginBoxShow},       
         {header : "包状态",dataIndex : 'status',width : 80,menuDisabled: true},
         {header : "消毒或灭菌日期",dataIndex : 'sterileEndDate',width : 100,menuDisabled: true},
         {header : "消毒员",dataIndex : 'sterilizationUser',width : 80,menuDisabled: true}
@@ -634,6 +655,31 @@
 //								 value : new Date(),
 								 anchor : '95%'
 							}]
+						},{
+							columnWidth : .3,
+							layout : 'form',
+							labelWidth : 100,
+							hidden:!itemOriginBoxShow,
+							items : [{
+								xtype:'combo',
+								id : 'itemOrigin',
+								name : 'itemOrigin',
+								fieldLabel : '物品来源科室',
+								valueField : 'value',
+								displayField : 'value',
+								width : 80,
+								allowBlank : true,
+								editable : false,
+								value:'仅申请科室',
+								store : new Ext.data.SimpleStore({
+									fields : ['value'],
+									data : [['仅申请科室'],['所有科室']]
+								}),
+								mode:'local',
+								forceSelection : true,
+								triggerAction : 'all',
+								anchor : '95%'
+							}]
 						}]
 					}],
 					buttonAlign :'center',