Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r17478 -r17808
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 17478)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 17808)
@@ -953,10 +953,13 @@
 						inspectName = qmi.getFormDefinition().getFormName();
 					}
 					map.put("inspectName", inspectName);
+					// 备注信息
+					map.put("remark", qmi.getRemark());
 				}else{
 					map.put("createUserName", "");
 					map.put("createDate", "");
 					map.put("inspectName", "");
+					map.put("remark", "");
 				}
 				
 				
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r17770 -r17808
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17770)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17808)
@@ -89,6 +89,7 @@
 import com.forgon.disinfectsystem.entity.packing.PackingRecordOutItem;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
+import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
 import com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem;
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
@@ -4464,6 +4465,18 @@
 					tousseInstance.setWashEndTime(washRecord.getEndDateStr());
 				}
 			}
+			// 如果是质量监测废弃产生的装配任务，把重新生成的包条码，记录到质量检测和废弃器械包的信息
+			if(StringUtils.isNotBlank(currentPackingTask.getDiscardTiBarcode())){
+				// 获取质量监测记录
+				String barcode = currentPackingTask.getDiscardTiBarcode();
+				String whereSql = " where po.barcode = '" + barcode + "'";
+				QualityMonitoringInstance qmi = (QualityMonitoringInstance)objectDao.getBySql(QualityMonitoringInstance.class.getSimpleName(), whereSql);
+				if(qmi != null){
+					String remark = qmi.getRemark();
+					qmi.setRemark("重新装配条码 ： " + barcodeStr + " " + remark);
+					objectDao.saveOrUpdate(qmi);
+				}
+			}
 		}
 		
 		//设置包实例清洗信息
@@ -4880,6 +4893,8 @@
 					packingTask.setRecyclingBasketName(tousseInstance.getWashBasket());
 					// 设置标识牌
 					packingTask.setIdCardBarcode(tousseInstance.getIdCardInstanceBarcode());
+					// 设置废弃器械包的条码
+					packingTask.setDiscardTiBarcode(tousseInstance.getBarcode());
 					saveOrUpdate(packingTask);
 					if(isThereIDCard){
 						for(TousseInstance ti : tis){
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r17192 -r17808
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 17192)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js	(.../tousseInstanceInfoTab.js)	(revision 17808)
@@ -999,6 +999,21 @@
 								readOnly : true,
 								cls : 'fieldReadOnlyNoRemove'
 							}]
+						},{
+							layout : 'form',
+							columnWidth : .5,
+							cls:'edit-part2-labelwidth',
+							items : [{
+								id : 'inspectRemark',
+								name : 'inspectRemark',
+								xtype : 'textfield',
+								fieldLabel : '备注信息',
+								width : 250,
+								maxLength : 665,
+								anchor : '100%',
+								readOnly : true,
+								cls : 'fieldReadOnlyNoRemove'
+							}]
 						}]
 					}],
 					buttons : [this.cancelButton]
@@ -1012,7 +1027,7 @@
 	
 	
 	/**
-	 * 设置器械包实例的一些追信息
+	 * 设置器械包实例的一些追溯信息
 	 */
 	this.setTousseInstanceInfo = function() {
 		
@@ -1186,6 +1201,7 @@
 						top.Ext.getCmp('inspectName').setValue(result.inspectName);  //质量记录_监测项名称
 						top.Ext.getCmp('createUserName').setValue(result.createUserName);  //回收记录_登记人
 						top.Ext.getCmp('createDate').setValue(result.createDate);  //回收记录_登记时间
+						top.Ext.getCmp('inspectRemark').setValue(result.remark);  // 质量监测的备注信息
 					}
 					
 					
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
===================================================================
diff -u -r17512 -r17808
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 17512)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 17808)
@@ -89,6 +89,10 @@
 	 * 装配时扫描出该装配任务选中后（在没有丢失的情况下），直接把标识牌条码带出来，不用再扫标识牌条码
 	 */
 	private String idCardBarcode;
+	/**
+	 * 废弃器械包的条码
+	 */
+	private String discardTiBarcode;
 	
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
@@ -293,5 +297,12 @@
 	public void setIdCardBarcode(String idCardBarcode) {
 		this.idCardBarcode = idCardBarcode;
 	}
-	
+
+	public String getDiscardTiBarcode() {
+		return discardTiBarcode;
+	}
+
+	public void setDiscardTiBarcode(String discardTiBarcode) {
+		this.discardTiBarcode = discardTiBarcode;
+	}
 }