Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r24703 -r24710
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 24703)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 24710)
@@ -858,6 +858,7 @@
 	
 	/**
 	 * 根据扫描的条码加载对应的对象.
+	 * 用于科室回收、快速回收、自定义入筐扫条码使用
 	 * @return
 	 */
 	public String getBarcodeInfo() {
@@ -900,17 +901,23 @@
 						.getBarcodeByBarcode(barcode);
 				if (barcodeDevice instanceof Container) {
 					Container container = (Container) barcodeDevice;
+					//判断该容器是否为清洗筐
 					if(container.isCleanBasket()){
-						try{
-							classifyBasket = getClassifyBasket(container, recyclingRecordId);
-							if(classifyBasket != null){
-								classifyBasket.setContainerStatus(container.getStatus());
+						//判断该清洗筐的所属科室是否为当前科室
+						if(!StringUtils.equals(container.getDepartCode(), AcegiHelper.getCurrentOrgUnitCode())){
+							errorMessage = "该清洗篮筐的科室为"+ container.getDepartName() +",只能扫描本科室的清洗篮筐条码！";
+						}else{
+							try{
+								classifyBasket = getClassifyBasket(container, recyclingRecordId);
+								if(classifyBasket != null){
+									classifyBasket.setContainerStatus(container.getStatus());
+								}
+							}catch(UnfinishedPackingTaskException e){
+								errorMessage = e.getMessage();
+								unfinishedPackingTask = e.getWaitPackingTask();
+							}catch(RuntimeException e){
+								errorMessage = e.getMessage();
 							}
-						}catch(UnfinishedPackingTaskException e){
-							errorMessage = e.getMessage();
-							unfinishedPackingTask = e.getWaitPackingTask();
-						}catch(RuntimeException e){
-							errorMessage = e.getMessage();
 						}
 					}else{
 						errorMessage = "您扫描的条码不是清洗篮筐条码！";