Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r21973 -r21975
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21973)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21975)
@@ -102,8 +102,6 @@
 import com.forgon.tools.MathTools;
 import com.forgon.tools.SpringBeanManger;
 import com.forgon.tools.SqlBuilder;
-import com.forgon.tools.StrutsParamUtils;
-import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.date.DateTools;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
@@ -1244,9 +1242,9 @@
 		if (id != null) {
 			try {
 //				Set<String> status = new HashSet<String>();
-//				status.add(TousseInstance.STATUS_STERILED);
+//				status.add(TousseInstance.STATUS_DISCARD);
 //				String sql = String.format("where po.foreignTousseApp_id = %s and %s ", id,SqlUtils.getStringFieldInCollectionsPredicate("po.status", status));
-				String sql = String.format("where po.foreignTousseApp_id = %s and po.insteadTiBarcode is null ", id);
+				String sql = String.format("where po.foreignTousseApp_id = %s and po.wasteDate is null and po.insteadTiBarcode is null ", id);
 				return objectDao.findBySql(
 						TousseInstance.class.getSimpleName(), sql);
 			} catch (Exception e) {
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r21535 -r21975
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 21535)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 21975)
@@ -241,9 +241,11 @@
 	 * 科室编码(外部代理灭菌物品装配打印时记录暂不处理)
 	 */
 	private String departCoding;
+	/**
+	 * 废弃时间,废弃是一定要设置这个属性，有的地方是根据wasteDate是否为null来判断包是否废弃
+	 */
+	private Date wasteDate;
 	
-	private Date wasteDate; //废弃时间
-	
 	private String wasteReason; //废弃原因
 	/**
 	 * 废弃操作人
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r21759 -r21975
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21759)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 21975)
@@ -5201,7 +5201,7 @@
 		if(tiList.size() > 1){
 			throw new RuntimeException("该外来器械包已拆分！");
 		}
-		
+		Date date = new Date();
 		TousseInstance originalTousseInstance = tiList.get(0);
 		
 		TousseDefinition td = originalTousseInstance.getTousseDefinition();
@@ -5287,6 +5287,9 @@
 		updatePackingRecordInfo(splitPackages.size(),originalTousseInstance.getPackingRecord_id());
 
 		originalTousseInstance.setStatus(TousseInstance.STATUS_DISCARD);
+		originalTousseInstance.setWasteDate(date);
+		originalTousseInstance.setWasteReason("干预外来器械拆包");
+		originalTousseInstance.setOperateUser(loginUser.getUserFullName());
 		originalTousseInstance.setPackingRecord_id(null);//去掉装配记录
 		originalTousseInstance.setForeignTousseApp_id(null);
 		originalTousseInstance.setInvoicePlanID(null);