Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r36560 -r36562
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 36560)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 36562)
@@ -10034,6 +10034,11 @@
 	}
 	@Override
 	public JSONArray findMaterialErrorDamageByTousseBarcode(Long recyclingRecordId, String tousseBarcodes) {
+		boolean allowPackingWhenUnSupplementMaterial = CssdUtils.getSystemSetConfigByNameBool("allowPackingWhenUnSupplementMaterial");
+		JSONArray array = new JSONArray();
+		if(!allowPackingWhenUnSupplementMaterial){
+			return array;
+		}
 		StringBuffer sbf = new StringBuffer();
 		if(DatabaseUtil.isPoIdValid(recyclingRecordId)){
 			sbf.append("select ip.tousseBarcodes from ");
@@ -10055,7 +10060,6 @@
 				DatabaseUtil.closeResultSetAndStatement(rs);
 			}
 		}
-		JSONArray array = new JSONArray();
 		if(StringUtils.isNotBlank(tousseBarcodes)){
 	   		//;011265502;011265501;011265500;
 			Set<String> barcodes = SqlUtils.splitStringToSet(tousseBarcodes, ";");
@@ -10089,11 +10093,8 @@
 					DatabaseUtil.closeResultSetAndStatement(rs);
 				}
 			}
-			boolean allowPackingWhenUnSupplementMaterial = CssdUtils.getSystemSetConfigByNameBool("allowPackingWhenUnSupplementMaterial");
-			List<MaterialErrorDamageDetail> errorDamages = null;
-			if(allowPackingWhenUnSupplementMaterial){
-				errorDamages = materialErrorDamageDetailManager.getCollection(barcodes);
-			}
+			
+			List<MaterialErrorDamageDetail> errorDamages = materialErrorDamageDetailManager.getCollection(barcodes);
 			Map<String,List<MaterialErrorDamageDetail>> detailsMap = materialErrorDamageDetailManager.groupByTousseInstanceBarcode(errorDamages);;
 			if(tousseArr != null && tousseArr.size() > 0){
 				for (int i = 0; i < tousseArr.size(); i++) {
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
===================================================================
diff -u -r36561 -r36562
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 36561)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 36562)
@@ -850,7 +850,7 @@
 		StringBuffer sbf = new StringBuffer();
 		sbf.append("select po from ");
 		sbf.append(MaterialErrorDamageDetail.class.getSimpleName());
-		sbf.append(" po where ");
+		sbf.append(" po where 1=1 ");
 		sbf.append(SqlUtils.getInStringListSql("po.tousseBarcode", barcodes));
 		sbf.append(" and po.amount > po.additionalAmount");
 		return objectDao.findByHql(sbf.toString());