Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r20451 -r20462
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20451)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 20462)
@@ -1643,6 +1643,7 @@
 				+ "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask from PackingTask po , CssdHandleTousses ct , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and ct.tousseDefinitionId=td.ancestorID and po.orgUnitCoding = ct.orgUnitCode "
+				+ "and (td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) "    //外来器械和自定义器械，有专门获取装配任务
 				+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 ";
 		if(StringUtils.isNotBlank(basketBarcode)){
 			//验证篮筐是否清洗
@@ -4558,7 +4559,7 @@
 				throw new RuntimeException("保存失败！");
 			}
 			TousseDefinition tousseDefinition = packingTask.getTousseDefinition();
-			if(tousseDefinition.isForeignTousse() && allowForeignToussePartiallyPacking && !isForeignToussePackedComplete(tousseDefinition, packingTask.getSourceId())){
+			if(tousseDefinition.isForeignTousse() && packingTask.multiClassifyBasket() && allowForeignToussePartiallyPacking && !isForeignToussePackedComplete(tousseDefinition, packingTask.getSourceId())){
 				// 部分装配的外来器械，并且还未装完。
 				break;
 			}
@@ -4601,7 +4602,7 @@
 					int count = objectDao.countObjectBySql(PackingTask.class.getSimpleName(), sql);
 					if(count == 0){
 						Container container = containerManager.getContainerByBarcode(basketBarcode);
-						if(container != null && Container.CONTAINER_STATUS_WASHED.equals(container.getStatus())){
+						if(container != null && container.washed()){
 							container.setStatus(Container.CONTAINER_STATUS_PACKED);
 							containerManager.saveOrUpdate(container);
 						}