Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r30680 -r30734
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 30680)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 30734)
@@ -1083,12 +1083,14 @@
 							if(!isFixedBarcode && !TousseInstance.STATUS_SHIPPED.equals(tousseInstance.getStatus()) &&
 									   !TousseInstance.STATUS_USED.equals(tousseInstance.getStatus()) &&
 									   !TousseInstance.STATUS_SIGNED.equals(tousseInstance.getStatus()) &&
+									   !TousseInstance.STATUS_DISCARD.equals(tousseInstance.getStatus()) &&
 									   !TousseInstance.STATUS_PRERECYCLED.equals(tousseInstance.getStatus())){//包状态检查 2020-07-08 11:32:00
-										errorMessage = String.format("【必须是%s、%s、%s或%s的状态的包，该包当前状态为：%s，%s】",
+										errorMessage = String.format("【必须是%s、%s、%s、%s或%s的状态的包，该包当前状态为：%s，%s】",
 												TousseInstance.STATUS_SHIPPED,
 												TousseInstance.STATUS_USED,
 												TousseInstance.STATUS_SIGNED,
 												TousseInstance.STATUS_PRERECYCLED,
+												TousseInstance.STATUS_DISCARD,
 												tousseInstance.getStatus(),
 												tousseInstanceManager.getDateStrByTousseInstanceStatus(tousseInstance));
 									}else{
@@ -1207,13 +1209,14 @@
 									details = build(materialErrorDamageDetailManager.get(tousseInstance));
 								}
 							} else {
-								errorMessage = String.format("器械包必须是%s、%s、%s、%s、%s、%s的状态,该包当前状态为:%s",
+								errorMessage = String.format("器械包必须是%s、%s、%s、%s、%s、%s、%s的状态,该包当前状态为:%s",
 										TousseInstance.STATUS_SHIPPED,
 										TousseInstance.STATUS_USED,
 										TousseInstance.STATUS_SIGNED,
 										TousseInstance.STATUS_PRERECYCLED,
 										TousseInstance.STATUS_WAIT_FOR_RECALL,
 										TousseInstance.STATUS_RECALLED,
+										TousseInstance.STATUS_DISCARD,
 										TousseInstanceUtils.getStatusAndTimeByTousseInstanceAndInvoicePlan(tousseInstance, null, null, invoicePlanManager.get(tousseInstance.getInvoicePlanID())));
 //								tousseInstance = null;
 								errorType = "idCard_statusIllegal";