Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r17816 -r18057
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 17816)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 18057)
@@ -160,7 +160,7 @@
             <div class="name">回收人&nbsp;&nbsp;<input id="recyclingUser" name="recyclingUser" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);"/></div>
             <div class="operator">清点人&nbsp;&nbsp;<input id="operator" name="operator" type="text" readonly="readonly" class="input" onclick="selectUserType(this.id);"/></div>
             <div class="recyclingTime">回收时间&nbsp;&nbsp;<input id="recyclingTime" name="recyclingTime" type="text" readonly="readonly" class="input"/></div>
-            <div class="depart">科&nbsp;&nbsp;&nbsp;室&nbsp;&nbsp;<input id="depart" name="depart" type="text" class="input" readonly="readonly" <c:if test="${param.recyclingApplicationId == null}"> onclick='openSelectDepart();'</c:if> /></div>
+            <div class="depart">科&nbsp;&nbsp;&nbsp;室&nbsp;&nbsp;<input id="depart" name="depart" type="text" class="input" readonly="readonly" onclick='openSelectDepart();' /></div>
             <div class="appType">类&nbsp;&nbsp;型&nbsp;&nbsp;&nbsp;<input id="appType" name="appType" type="text" readonly="readonly" class="input"/></div>
             <div class="applyTime">申请时间&nbsp;&nbsp;<input id="applyTime" name="applyTime" type="text" readonly="readonly" class="input"/></div>
             <c:if test="${param.resolution != 1980}">
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r17968 -r18057
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 17968)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 18057)
@@ -2322,6 +2322,21 @@
 }
 //选择科室
 function openSelectDepart(){
+	var canChangeDepart = false;
+	if(isUndefinedOrNullOrEmpty(params_appId)){
+		//添加的回收申请单,可以修改科室
+		canChangeDepart = true;
+	}else if(sstsConfig.canChangeDepartInRecyclingForwaitRecycleInvoicePlan){
+		canChangeDepart = true;
+	}
+	//如果是历史回收记录,不能修改科室
+	if('history' == params_recordType){
+		canChangeDepart = false;
+  	}
+	if(!canChangeDepart){
+		//不可以修改科室,那就返回喽
+		return;
+	}
     var width = 780;
     var height = 650;
     var designedTousseWidth = 1080;
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r18011 -r18057
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 18011)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 18057)
@@ -1199,7 +1199,16 @@
 				if(InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION.equals(application.getType())){
 					isChange = true;
 				} else {
-					throw new RuntimeException("该回收单单类型不是回收申请单，不能修改科室！");
+					boolean canChangeDepart = CssdUtils.getSystemSetConfigByNameBool("canChangeDepartInRecyclingForwaitRecycleInvoicePlan");
+					if(canChangeDepart){
+						if(!application.awaitDeliver()){
+							//
+							throw new RuntimeException("申请单发货状态为" + application.getDeliverStatus() + ",不能修改科室！");
+						}
+						isChange = true;
+					}else{
+						throw new RuntimeException("该回收单单类型不是回收申请单，不能修改科室！");
+					}
 				}
 			}
 		}