Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r13683 -r13687
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 13683)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 13687)
@@ -854,15 +854,15 @@
 					throw new RuntimeException(tousseName + "已装配，不能修改！");
 				}
 				//部分装配 后修改回收数量
-				if(task != null && task.getUnPackAmount() + amount  <  0){
+				if(task != null && task.getUnPackAmount() != null && task.getUnPackAmount() + amount  <  0){
 					throw new RuntimeException(tousseName + "已装配，不能修改！");
 				}
 				if(task == null){
 					task = new PackingTask();
 					task.setUnPackAmount(0);
 					task.setAmount(0);
 				}
-				//删除回收记录
+				//删除装配记录
 				if (task.getId() != null && task.getUnPackAmount() != null
 						&& task.getUnPackAmount() + amount == 0) {
 					packingManager.delete(task);
@@ -871,6 +871,10 @@
 				task.setStartTime(new Date());
 				
 				task.setAmount(task.getAmount() + amount);
+				
+				if(task.getId() == null && task.getAmount() <= 0){
+					continue;
+				}
 				task.setUnPackAmount(task.getUnPackAmount() + amount);
 				// 设置装配任务状态
 				task.setStatus(PackingTask.STATUS_AWAIT_PACKING);
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r13683 -r13687
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13683)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13687)
@@ -1278,7 +1278,7 @@
 				+ "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName from PackingTask po , CssdHandleTousses ct , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and ct.tousseDefinitionId=td.ancestorID and po.orgUnitCoding = ct.orgUnitCode "
-				+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "'";
+				+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 ";
 		if(StringUtils.isNotBlank(basketBarcode)){
 			//验证篮筐是否清洗
 			Container basket = containerManager