Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r18470 -r18475
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 18470)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 18475)
@@ -4521,10 +4521,11 @@
 					tousseInstance.setWashEndTime(washRecord.getEndDateStr());
 				}
 			}
-			// 如果是质量监测废弃产生的装配任务，把重新生成的包条码，记录到质量检测和废弃器械包的信息
+			// 如果是质量监测废弃产生的装配任务，把重新生成的包条码，记录到质量检测和废弃器械包的信息,并且把新的包条码记录到废弃的包
 			if(StringUtils.isNotBlank(currentPackingTask.getDiscardTiBarcode())){
 				// 获取质量监测记录
 				String barcode = currentPackingTask.getDiscardTiBarcode();
+				TousseInstance discardTi = tousseInstanceManager.getTousseInstanceByBarcode(barcode);
 				Session session = objectDao.getHibernateSession();
 				Query query = session.createQuery(" select distinct qmi from QualityMonitoringInstance qmi inner join  qmi.qualityMonitoringGoodsList qmd "
 						+ " where qmd.barcode = :barcode ");
@@ -4538,6 +4539,10 @@
 						objectDao.saveOrUpdate(qmi);
 					}
 				}
+				if(discardTi != null){
+					discardTi.setInsteadTiBarcode(barcodeStr);
+					objectDao.saveOrUpdate(discardTi);
+				}
 //				String whereSql = " where po.barcode = '" + barcode + "'";
 //				QualityMonitoringInstance qmi = (QualityMonitoringInstance)objectDao.getBySql(QualityMonitoringInstance.class.getSimpleName(), whereSql);
 //				if(qmi != null){
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r18383 -r18475
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 18383)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 18475)
@@ -437,6 +437,10 @@
 	 * 器械交接明细项的id(预回收中扫描条码,记录扫描的包实例的条码)
 	 */
 	private Long tousseTransitionItemId;
+	/*
+	 * 是否被重新替换的包的条码，这个字段不为空时，是包需要重新装配。
+	 */
+	private String  insteadTiBarcode;
 
 	public static final String[] filterProperties = { "handler",
 			"hibernateLazyInitializer", "fieldHandler", "materialInstances",
@@ -460,7 +464,14 @@
         "tousseDefinitionName","isThereIdentificationCard"/*,"washStartTime","washOperator"*/,"invoiceSender" ,
         "invoiceSendTime","tousseDefinition","wareHouseId","wareHouseName"};
 	
-	
+	public String getInsteadTiBarcode() {
+		return insteadTiBarcode;
+	}
+
+	public void setInsteadTiBarcode(String insteadTiBarcode) {
+		this.insteadTiBarcode = insteadTiBarcode;
+	}
+
 	public Long getPackingRecord_id() {
 		return packingRecord_id;
 	}