Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r18233 -r18245
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 18233)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 18245)
@@ -4160,18 +4160,9 @@
 				}else{
 					//根据装配任务的sourceId及包定义id关联到对应的上一个包实例
 					//查询该标识牌对应的上一个包实例,并将新的包实例的上一个包实例id进行设置
-					TousseInstance lastTousseInstance = null;
-					if(DatabaseUtil.isPoIdValid(prePackingTask.getSourceId())){
-						Long sourceId = prePackingTask.getSourceId();
-						Long tdId = prePackingTask.getTousseDefinition().getId();
-						if(taskType != null){
-							if(PackingTask.TASK_RETURNGOODS.intValue() == taskType.intValue()){
-								tousseInstance.setLastTousseInstanceId(lastTousseInstance.getId());
-							}else if(PackingTask.TASK_QUALITY_MONITOR.intValue() == taskType.intValue()){
-								String sourceTousseInstanceIds = prePackingTask.getSourceTousseInstanceIds();
-								tousseInstance.setLastTousseInstanceId(lastTousseInstance.getId());
-							}
-						}
+					TousseInstance lastTousseInstance = tousseInstanceManager.getLastTousseInstanceByPackingTask(prePackingTask);
+					if(lastTousseInstance != null){
+						tousseInstance.setLastTousseInstanceId(lastTousseInstance.getId());
 					}
 				}