Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r19615 -r19627
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 19615)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 19627)
@@ -51,10 +51,27 @@
 var updateDetailObj = new UpdateDetailObj();
 /**
  * 打开对应的表单
- * @param form			对应的表单
+ * @param form			申请表单类型
  * @param tousseType	器械包类型
  */
-function openApplication(tousseType,form) {
+function openApplication(tousseType, form) {
+	//限制同一个科室（供应室除外）只能申请一张申请单
+	if (sstsConfig.limitApply && form == comboApplicationForm && !isSupplyRoomUser) {
+		var existRecyclingApplication = null;
+		DWREngine.setAsync(false);
+		RecyclingApplicationTableManager.getRecyclingApplicationByDepartmentCode($Id('departCoding').value, function(result) {
+			if (result && result != 'null') {
+				existRecyclingApplication = result;
+			}
+		});
+		DWREngine.setAsync(true);
+		if (existRecyclingApplication) {
+			showResult('本科室已经申请过物品，请确认申请的物品！');
+			setRecyclingApplicationForm(existRecyclingApplication);
+			return;
+		}
+	}
+		
 	//新打开申请对话框时,相关参数调整及清除
 	handleDepartStore.proxy.extraParams.tousseType = tousseType;
 	handleDepartStore.proxy.extraParams.applyDepartCode = "";
@@ -1665,7 +1682,7 @@
 };
 
 /**
- * 根据返回的结果重置表单数据.
+ * 根据返回的结果重置表单数据，并且打开对应的申请表单.
  * @param tempRecyclingApplication	申请单对象
  */
 function setRecyclingApplicationForm(tempRecyclingApplication){
@@ -2079,15 +2096,15 @@
 
 /**
  * 创建操作的工具栏.
- * @param isSupplyRoomUser 是否供应室用户
+ * @param isFirstSupplyRoomUser 是否为一级供应室用户
  * @returns {[*,*,*,*,*]}
  */
-function createOperationTbar(isSupplyRoomUser) {
+function createOperationTbar(isFirstSupplyRoomUser) {
     return [
         {
             text: '借物',
             iconCls: 'btn_ext_add_tousse',
-            hidden: SSTS_borrow_Create || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+            hidden: SSTS_borrow_Create || (sstsConfig.recyclingApplicationVersion == 2 && !isFirstSupplyRoomUser),
             handler: function () {
                 addAndEditTousseLease('');
             }
@@ -2114,7 +2131,7 @@
             hidden: SSTS_PrintApplicationGoods,
             menu: new Ext.menu.Menu({
                 items: [
-                    {text: '批量打印' + invoicePlanPrintButtonName, hidden: !isSupplyRoomUser, handler: bathPrint},
+                    {text: '批量打印' + invoicePlanPrintButtonName, hidden: !isFirstSupplyRoomUser, handler: bathPrint},
                     {
                         text: '打印一次性物品', handler: function () {
                         var ids = getSelectedIds();
@@ -2234,6 +2251,7 @@
         }
     ];
 }
+
 /**
  * 创建按科室分组下拉选项
  * @returns
@@ -2435,9 +2453,6 @@
 	});
     top.Ext4.tip.QuickTipManager.init();
 	
-	//是否供应室用户
-	var isSupplyRoomUser = validateIsSupplyRoomUser();
-	
 	var columns = [
 	     {header : "流水号",width : 90 * fontSizeScale,dataIndex : 'serialNumber', renderer : renderModifyFun},
 	     {header : "申请科室",width : 120 * fontSizeScale,dataIndex : 'depart',hidden:sstsConfig.hideApplyDepartColumn || isCssdUser != 'true'},
@@ -2484,7 +2499,7 @@
         	    		 inoviceButton = "<input type=\"button\" value=\"查看发货单\" onclick=\"searchInvoice('"+record.data.id+"')\">";
         	    	 }
     	    	 }
-    	    	 if(sstsConfig.enableReturnGoodsByInvoicePlan && isSupplyRoomUser && (invoicePlanType != customTousseApplicationForm) && invoicePlanType != foreignTousseApplicationForm && invoicePlanType != foreignPorxyApplicationForm){
+    	    	 if(sstsConfig.enableReturnGoodsByInvoicePlan && isFirstSupplyRoomUser && (invoicePlanType != customTousseApplicationForm) && invoicePlanType != foreignTousseApplicationForm && invoicePlanType != foreignPorxyApplicationForm){
     	    		 if(deliverStatus == '已发货' || deliverStatus == '部分发货' || invoiceStatus == '部分签收' || invoiceStatus == '已签收'){
         	    		 returnGoodsButton += "<input type=\"button\" value=\"一次性物品退货\" onclick=\"addReturnDisposableGoodsByInvoicePlan('"+record.data.id+"')\">";
         	    		 returnGoodsButton += "<input type=\"button\" value=\"器械包退货\" onclick=\"addReturnTousseByInvoicePlan('"+record.data.id+"')\">";
@@ -2634,9 +2649,6 @@
 		}
 	};
 
-
-	var isSupplyRoomUser = validateIsSupplyRoomUser();
-
 	//搜索的tbar
     var searchTbar = createSearchTbar({
         quickScreenCombo : quickScreenCombo,
@@ -2646,7 +2658,7 @@
     });
 
     //操作的tbar
-    var operationTbar = createOperationTbar(isSupplyRoomUser);
+    var operationTbar = createOperationTbar(isFirstSupplyRoomUser);
 
 	var tbar = [{
 			text : '申请物品',
@@ -2663,7 +2675,7 @@
 			id : 'applyTousse',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : sstsConfig.packageName || '申请器械包',
-			hidden : SSTS_PACKAGE_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+			hidden : SSTS_PACKAGE_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isFirstSupplyRoomUser),
 			handler : function() {
                 formPrinted = 1;
                 openApplication(invoicePlanForTousseType_Tousse, tousseApplicationForm);
@@ -2673,7 +2685,7 @@
             id : 'applyDisposableGood',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : '申请一次性物品',
-			hidden : SSTS_DisposableGoods_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+			hidden : SSTS_DisposableGoods_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isFirstSupplyRoomUser),
 			handler : function() {
                 formPrinted = 1;
                 openApplication(invoicePlanForTousseType_Diposable, diposableGoodsApplicationForm);
@@ -2683,7 +2695,7 @@
 			id : 'applyDisinfection',
 			tooltip : '申请内容物不固定的消毒物品',
 			iconCls : 'btn_ext_add_foreignTousse',
-			hidden : SSTS_Disinfection_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+			hidden : SSTS_Disinfection_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isFirstSupplyRoomUser),
 			handler : function() {
                 formPrinted = 1;
                 openApplication(invoicePlanForTousseType_Tousse, disinfectGoodsApplicationForm);