Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java
===================================================================
diff -u -r23956 -r26634
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java	(.../ForeignTousseWebServiceImpl.java)	(revision 23956)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/foreignTousse/service/ForeignTousseWebServiceImpl.java	(.../ForeignTousseWebServiceImpl.java)	(revision 26634)
@@ -14,6 +14,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.forgon.Constants;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
@@ -81,14 +82,14 @@
 
 	/**
 	 * 查询外来器械包及供应商信息
-	 * @param supplierName
+	 * @param supplierName 供应商名称
 	 * @return
 	 */
 	private JSONObject findForeignTousseInfoData(String supplierName) {
 		String querySql = "select sp.companyName,sp.contact,sp.cellPhone,td.id,td.name," + 
 		" case when td.price is null or td.price = 0 then (select top 1 foreignToussePrice from "+ SupplyRoomConfig.class.getSimpleName() +" where supplyRoomType=0) else td.price end price " + 
 		" from "+ TousseDefinition.class.getSimpleName() +" td join "+ Supplier.class.getSimpleName() +" sp on td.supplierName=sp.companyName" + 
-		" where sp.rentTousse='"+ Supplier.SUPPLIER_TYPE_RENTTOUSSE +"' and td.forDisplay=1 and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"'";
+		" where td.isDisable='"+ Constants.STR_NO +"' and sp.rentTousse='"+ Supplier.SUPPLIER_TYPE_RENTTOUSSE +"' and td.forDisplay=1 and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"'";
 		if(StringUtils.isNotBlank(supplierName)){
 			querySql += " and sp.companyName = '"+ supplierName +"' ";
 		}
@@ -182,6 +183,11 @@
 						appLogManager.saveLog(AcegiHelper.getLoginUser(), "调用接口" , Log.TYPE_QUERY, "调用外来器械包接口的submitForeignTousseApplication方法,返回结果=" + returnJSONObject);
 						return xmlSerializer.write(returnJSONObject);
 					}
+					if(StringUtils.equals(Constants.STR_YES, tousseDefinition.getIsDisable())){
+						returnJSONObject.put("message","【"+ tousseDefinition.getName() +"】已停用,TOUSSEDEFINITION_ID为"+ tousseDefinitionId);
+						appLogManager.saveLog(AcegiHelper.getLoginUser(), "调用接口" , Log.TYPE_QUERY, "调用外来器械包接口的submitForeignTousseApplication方法,返回结果=" + returnJSONObject);
+						return xmlSerializer.write(returnJSONObject);
+					}
 					JSONObject foreignTousseInfoJsonObject = new JSONObject();
 					foreignTousseInfoJsonObject.put("amount", 1);
 					foreignTousseInfoJsonObject.put("tousseName", tousseDefinition.getName());