Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/PrepareRecyleScanBarcode.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/PrepareRecyleScanBarcode.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/PrepareRecyleScanBarcode.java	(revision 35505)
@@ -0,0 +1,62 @@
+package com.forgon.disinfectsystem.entity.tousseitem;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+/**
+ * 预回收扫描条码的记录(原始问题:QYSRMYY-54)
+ * @author syf
+ * @since 2023-03-30
+ */
+@Entity
+@DynamicInsert(false)
+@DynamicUpdate(true)
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class PrepareRecyleScanBarcode {
+
+	private Long id;
+
+	/**
+	 * 申请项(即器械包预回收的项)id
+	 */
+	private Long tousseItemId;
+
+	/**
+	 * 器械包实例条码(只存器械包实例的条码,每一个单独的器械包实例条码占一行)
+	 */
+	private String tousseInstanceBarcode;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getTousseItemId() {
+		return tousseItemId;
+	}
+
+	public void setTousseItemId(Long tousseItemId) {
+		this.tousseItemId = tousseItemId;
+	}
+
+	public String getTousseInstanceBarcode() {
+		return tousseInstanceBarcode;
+	}
+
+	public void setTousseInstanceBarcode(String tousseInstanceBarcode) {
+		this.tousseInstanceBarcode = tousseInstanceBarcode;
+	}
+
+}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r35458 -r35505
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 35458)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 35505)
@@ -3491,6 +3491,13 @@
 		return null;
 	}
 
+	@Override
+	public Map<Long, List<String>> getPrepareRecycleScanBarcodeInfo(
+			List<TousseItem> tousseItemList) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 	/**
 	 * {success:true,type:"器械包",data:{tousseName:"器械包名称",defineId:"包定义id",type:"器械包"
 	 * ,applyEntireTousse:"是否整包申请",materialInstancesJsonArray:"材料清单json"}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java
===================================================================
diff -u -r35342 -r35505
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 35342)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManager.java	(.../InvoicePlanManager.java)	(revision 35505)
@@ -146,13 +146,21 @@
 	 * 根据条码及申请单id返回JSON格式的结果.(如果条码为用户,则返回用户的信息;如果条码为器械包包外标签唯一条码、固定条码或标识牌条码条码时,则判断该申请单是否允许添加该器械包,如果不允许则抛出异常、允许则返回器械包的信息)
 	 * 返回结果示例:{success:true,type:"用户",data:{fullName:"张三"}}、{success:true,type:"器械包",data:{tousseName:"器械包名称",defineId:"包定义id",type:"器械包类型",applyEntireTousse:"是否整包申请",materialInstancesJsonArray:"材料清单json"}}
 	 * 详见需求:ZSRY-37 PDA【回收清点】模块在添加回收物品时新增扫描条码添加物品
+	 * 1.如果barcode参数为器械包实例条码(非固定条码的包实例)或标识牌实例条码,请将对应的器械包实例条码也返回;2.需要判断所传的器械包实例条码或标识牌实例条码是否有录入到其它申请中,如果有请进行相关的处理 详见QYSRMYY-54
 	 * @param invoicePlanId 申请单id
 	 * @param barcode 条码(可能是人员条码,也可能是器械包包外标签唯一条码、固定条码和标识牌条码)
 	 * @return
 	 */
 	public JSONObject getUserOrTousseDefinitionJsonByInvoicePlanAndBarcode(Long invoicePlanId, String barcode);
 
 	/**
+	 * 查找出预回收所扫描的条码信息
+	 * @param tousseItemList 申请项的集合
+	 * @return {"器械包1的包定义id":["包实例1的条码","包实例2的条码"],"器械包2的包定义id":["包实例3的条码","包实例4的条码"]}
+	 */
+	public Map<Long,List<String>> getPrepareRecycleScanBarcodeInfo(List<TousseItem> tousseItemList);
+
+	/**
 	 * 获取待交接物品的申请单
 	 * @param orgUnitCodings
 	 * @return