Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r40722 -r40723
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 40722)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 40723)
@@ -3251,9 +3251,9 @@
 					+ " left join IDCardInstance ii on ii.id=ifp.idCardInstanceID "
 					+ " left join IDCardDefinition idn on idn.id=ii.idCardDefinitionID "
 					+ leftJoinRecyclingRecordSql
-					+ getQuerySettleAccountsDepartCoding(settleAccountsDepartCoding)
 					+ "where po.orgUnitCoding = ct.orgUnitCode "
-					+ "and (td.tousseType not in('"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"+TousseDefinition.PACKAGE_TYPE_SPLIT+"','"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"')) "    //外来器械和自定义器械，有专门获取装配任务
+					+ getQuerySettleAccountsDepartCoding(settleAccountsDepartCoding)
+					+ " 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 " + recyclingAmountConfirmSql);
 		}
 		if(DatabaseUtil.isPoIdValid(packingTaskId)){