Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r34270 -r34348
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 34270)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 34348)
@@ -126,7 +126,7 @@
 	 * 具体的业务详见ZJYY-108 的2.1小点
 	 * @param orgUnitCodings 科室名称,可能有多个值
 	 * @param departmentGroupId 科室分组id
-	 * @param barcode 条码(支持手术间条码、科室条码、标识牌条码,若为其它类型条码或非法条码直接抛异常)
+	 * @param barcode 条码(支持手术间条码、科室条码、标识牌条码、器械包实例条码(包外条码),若为其它类型条码或非法条码直接抛异常(具体异常信息内容详见ZJYY-108里的说明))
 	 * @param instrumentSetTypeId(器械包种类id)
 	 * @return
 	 */
@@ -140,7 +140,18 @@
 	 * @return
 	 */
 	public List<TousseItem> getSortedTousseItemListByInvoicePlanIdAndInstrumentSetTypeId(Long invoicePlanId,Long instrumentSetTypeId);
+
 	/**
+	 * 根据条码及申请单id返回JSON格式的结果.(如果条码为用户,则返回用户的信息;如果条码为器械包包外标签唯一条码、固定条码或标识牌条码条码时,则判断该申请单是否允许添加该器械包,如果不允许则抛出异常、允许则返回器械包的信息)
+	 * 返回结果示例:{success:true,type:"用户",data:{fullName:"张三"}}、{success:true,type:"器械包",data:{tousseName:"器械包名称",defineId:"包定义id",type:"器械包",applyEntireTousse:"是否整包申请",materialInstancesJsonArray:"材料清单json"}}
+	 * 详见需求:ZSRY-37 PDA【回收清点】模块在添加回收物品时新增扫描条码添加物品
+	 * @param invoicePlanId 申请单id
+	 * @param barcode 条码(可能是人员条码,也可能是器械包包外标签唯一条码、固定条码和标识牌条码)
+	 * @return
+	 */
+	public JSONObject getUserOrTousseDefinitionJsonByInvoicePlanAndBarcode(Long invoicePlanId, String barcode);
+
+	/**
 	 * 获取待交接物品的申请单
 	 * @param orgUnitCodings
 	 * @return
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r34278 -r34348
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 34278)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 34348)
@@ -3267,6 +3267,13 @@
 		return tousseItemList;
 	}
 
+	@Override
+	public JSONObject getUserOrTousseDefinitionJsonByInvoicePlanAndBarcode(
+			Long invoicePlanId, String barcode) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	/**
 	 * 按照器械包种类排序编号排序（当一个器械包同时属于多个种类时，排序号取所属种类中的最小序号排列）
 	 * @param tousseItemList