Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js
===================================================================
diff -u -r16995 -r17082
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 16995)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationLoadingForm.js	(.../sterilizationLoadingForm.js)	(revision 17082)
@@ -86,6 +86,11 @@
 					url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!removeFromBasket.do',
 					params : {barcode : waitRemovingBarcodeArray.join(";")},
 					success : function(response, options) {
+						var result = Ext.decode(response.responseText);
+						if(!result || result.success == false){
+							showResult(result.message);
+							return;
+						}
 						for(var i = 0;i < rowDataArray.length;i++){
 							tousseStore.remove(rowDataArray[i]);
 						}
@@ -99,7 +104,7 @@
 					},
 					failure : function(response, options) {
 						var result = Ext.decode(response.responseText);
-						MsgTip.msg('提示', result.cause,true,3);
+						MsgTip.msg('提示', "后台运行异常,请稍后再试",true,3);
 					}
 				});
 			}
@@ -120,6 +125,11 @@
 				url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!removeFromBasket.do',
 				params : {barcode : rows[i].data.barcode},
 				success : function(response, options) {
+					var result = Ext.decode(response.responseText);
+					if(!result || result.success == false){
+						showResult(result.message);
+						return;
+					}
 					tousseStore.remove(row);
 					
 					//重新刷新效率太低(判断里面有没有符合的行,如果有则直接js修改数量,否则删除)
@@ -155,7 +165,7 @@
 				},
 				failure : function(response, options) {
 					var result = Ext.decode(response.responseText);
-					MsgTip.msg('提示', result.cause,true,3);
+					MsgTip.msg('提示', "后台运行异常,请稍后再试",true,3);
 				}
 			});
 		}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
===================================================================
diff -u -r16972 -r17082
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 16972)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 17082)
@@ -542,7 +542,8 @@
 				for (int i = 0; i < barcodeArray.length; i++) {
 					barcodes.add(barcodeArray[i]);
 				}
-				tousseInstanceManager.removeFromBasket(barcodes);
+				JSONObject jsonObject = tousseInstanceManager.removeFromBasket(barcodes);
+				StrutsResponseUtils.output(jsonObject);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r16972 -r17082
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 16972)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 17082)
@@ -126,8 +126,9 @@
 	/**
 	 * 灭菌装载移除包实例条码
 	 * @param tousseInstanceBarcodes 条码集合
+	 * @return JSONObject 格式如下:{success:true}、{success:false,message:""}
 	 */
-	public void removeFromBasket(Collection<String> tousseInstanceBarcodes);
+	public JSONObject removeFromBasket(Collection<String> tousseInstanceBarcodes);
 
 	public boolean isTousseStatusCorrect(TousseInstance tousseInstance);
 
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r16979 -r17082
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 16979)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 17082)
@@ -717,7 +717,9 @@
 	 * 将器械包从它所对应的篮筐中移除
 	 */
 	@Override
-	public void removeFromBasket(Collection<String> tousseInstanceBarcodes) {
+	public JSONObject removeFromBasket(Collection<String> tousseInstanceBarcodes) {
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("success", true);
 		Query query = objectDao.getHibernateSession().createQuery("from TousseInstance where barcode in (:barcodeList)");
 		query.setParameterList("barcodeList", tousseInstanceBarcodes);
 		@SuppressWarnings("unchecked")
@@ -726,6 +728,11 @@
 			String[] barcodeArray = new String[tousseInstanceList.size()];
 			int i = 0;
 			for (TousseInstance tousseInstance : tousseInstanceList) {
+				if(!tousseInstance.isReviewed()){
+					jsonObject.put("success", false);
+					jsonObject.put("message", "条码为" + tousseInstance.getBarcode() + "的器械包状态为" + tousseInstance.getStatus() + ",只能移除状态为已审核的器械包.");
+					return jsonObject;
+				}
 				JSONObject logObj = new JSONObject();
 				JSONUtil.modifyPropertyLog(logObj, "reviewBasket_ID", tousseInstance.getReviewBasket_id(),null);
 				JSONUtil.modifyPropertyLog(logObj, "status",tousseInstance.getStatus(),TousseInstance.STATUS_REVIEWED);
@@ -749,6 +756,7 @@
 							TousseInstance.STATUS_REVIEWED, StringUtils.join(barcodeArray, ","));
 			objectDao.excuteSQL(sql);
 		}
+		return jsonObject;
 	}