Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r37500 -r37556
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 37500)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 37556)
@@ -1112,7 +1112,7 @@
 			 * 基数验证第三步:验证是否有物品超过基数
 			 */
 			{
-				if(tousseNameToAmountMap.containsKey(tousseName)){
+				if(!disableCardinalNumLimit && tousseNameToAmountMap.containsKey(tousseName)){
 					Map<String, Integer> amountMap = tousseNameToAmountMap.get(tousseName);
 					if(MapUtils.isNotEmpty(amountMap) && amountMap.get(TousseInstance.STATUS_CARDINALNUM) != null){
 						Integer cardinalNum = amountMap.get(TousseInstance.STATUS_CARDINALNUM);//设置的基数
@@ -9949,6 +9949,7 @@
 	}
 	/**
 	 * 批量设置相关的器械包实例的回收项id的值
+	 * 不是使用记录转换过来的 不用修改 扫描包条码和标识牌的不在此修改
 	 * @param recyclingItems
 	 */
 	private void updateRelativeTousseInstanceRecyclingItemId(List<RecyclingItem> recyclingItems){
@@ -9957,7 +9958,22 @@
 		}
 		List<RecyclingItem> updateRecyclingItems = new ArrayList<RecyclingItem>();
 		for(RecyclingItem recyclingItem : recyclingItems){
-			if(recyclingItem != null && recyclingItem.getRecyclingRecord() != null && recyclingItem.getRecyclingRecord().getRecyclingApplication() != null){
+			if(recyclingItem != null && recyclingItem.getRecyclingRecord() != null 
+					&& recyclingItem.getRecyclingRecord().getRecyclingApplication() != null){
+				InvoicePlan invoicePlan = recyclingItem.getRecyclingRecord().getRecyclingApplication();
+				if(invoicePlan instanceof RecyclingApplication){
+					RecyclingApplication rapp = (RecyclingApplication)invoicePlan;
+					if(rapp.getUseRecord() == null){
+						continue;
+					}
+				}else if(invoicePlan instanceof ForeignTousseApplication){
+					ForeignTousseApplication rapp = (ForeignTousseApplication)invoicePlan;
+					if(rapp.getUseRecord() == null){
+						continue;
+					}
+				}else{
+					continue;
+				}
 				updateRecyclingItems.add(recyclingItem);
 			}
 		}