Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManager.java
===================================================================
diff -u -r32394 -r32408
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManager.java	(.../QualityMonitoringInstanceManager.java)	(revision 32394)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManager.java	(.../QualityMonitoringInstanceManager.java)	(revision 32408)
@@ -87,5 +87,12 @@
 	 * @return
 	 */
 	public JSONObject bathSaveQualityMonitoringInstance(QualityMonitoringInstance qualityMonitoringInstance, Map<String, String> requestParams);
+	
+	/**
+	 * 校验是否有包实例已经重新装配，并且返回提示信息: "xxx包、xxx包已经重新装配，不允许再次勾选重新回收或重新装配！"
+	 * @param barcodes
+	 * @return
+	 */
+	public JSONObject getTousseInstanceRepacking(String barcodes);
 
 }
Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java
===================================================================
diff -u -r32397 -r32408
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java	(.../QualityMonitoringInstanceManagerImpl.java)	(revision 32397)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/service/QualityMonitoringInstanceManagerImpl.java	(.../QualityMonitoringInstanceManagerImpl.java)	(revision 32408)
@@ -1359,4 +1359,35 @@
 		return result;
 	}
 
+	@Override
+	public JSONObject getTousseInstanceRepacking(String barcodes) {
+
+		JSONObject result = JSONUtil.buildJsonObject(true);
+		String sql = "select ti.toussename from " + TousseInstance.class.getSimpleName() + " ti where ti.id in ("
+				+ " select qmg.tousseinstanceid from " + QualityMonitoringGoods.class.getSimpleName() + " qmg "
+				+ " where qmg.isRepacking = '是' and qmg.barcode in ("
+				+ barcodes 
+				+ "))" ;
+		ResultSet rs = objectDao.executeSql(sql);
+		List<String> tousseNameList = new ArrayList<String>();
+		if (rs != null) {
+			try {
+				while (rs.next()) {
+					tousseNameList.add(rs.getString("toussename"));
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			} finally {
+				DatabaseUtil.closeResultSetAndStatement(rs);
+			}
+		}
+		if(CollectionUtils.isNotEmpty(tousseNameList)){
+			JSONUtil.addProperty(result, "haveRepacking", true);
+			JSONUtil.addProperty(result, "message", StringTools.join(tousseNameList, "、") + "已经重新装配，不允许再次勾选重新回收或重新装配！");
+		}else{
+			JSONUtil.addProperty(result, "haveRepacking", false);
+		}
+		return result;
+	}
+
 }
Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java
===================================================================
diff -u -r32394 -r32408
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java	(.../QualityMonitoringInstanceAction.java)	(revision 32394)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/instance/action/QualityMonitoringInstanceAction.java	(.../QualityMonitoringInstanceAction.java)	(revision 32408)
@@ -36,17 +36,17 @@
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringGoods;
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoring.QualityMonitoringInstance;
 import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition;
-import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.qualitymonitoring.instance.service.QualityMonitoringInstanceManager;
 import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager;
+import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
+import com.forgon.exception.SystemException;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
 import com.forgon.tools.ImageUtils;
 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.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
 import com.opensymphony.xwork2.ModelDriven;
@@ -132,6 +132,9 @@
 		JSONObject result = JSONUtil.buildJsonObject(true, "保存成功！");
 		try {
 			result = qualityMonitoringInstanceManager.bathSaveQualityMonitoringInstance(qualityMonitoringInstance, map);
+		}catch(SystemException e){
+			result = JSONUtil.buildJsonObject(false, e.getMessage());
+			e.printStackTrace();
 		} catch (Exception e) {
 			result = JSONUtil.buildJsonObject(false, "保存失败：" + e.getMessage());
 			e.printStackTrace();
@@ -414,12 +417,10 @@
 	 */
 	public void checkIsTousseInstanceRepacking() {
 		String barcodes = StrutsParamUtils.getPraramValue("barcodes", "");
-		boolean haveRepacking = false;// 是否已经重新装配
+		JSONObject json = JSONUtil.buildJsonObject(true);
 		if(StringUtils.isNotBlank(barcodes)){
-			haveRepacking = qualityMonitoringInstanceManager.isTousseInstanceRepacking(barcodes);
+			json = qualityMonitoringInstanceManager.getTousseInstanceRepacking(barcodes);
 		}
-		JSONObject json = JSONUtil.buildJsonObject(true);
-		JSONUtil.addProperty(json, "haveRepacking", haveRepacking);
 		StrutsResponseUtils.output(json);
 	}