Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java
===================================================================
diff -u -r18104 -r18107
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java	(.../WashTransitionItemManagerImpl.java)	(revision 18104)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/washTransition/service/WashTransitionItemManagerImpl.java	(.../WashTransitionItemManagerImpl.java)	(revision 18107)
@@ -193,18 +193,23 @@
 			}
 			
 			long tousseId = json.optLong("tousseInstanceId");
+			Long tousseDefId = null;
 			if(DatabaseUtil.isPoIdValid(tousseId)){
+				TousseInstance ti = tousseInstanceManager.get(tousseId);
+				if(ti != null){
+					item.setTousseBarcode(ti.getBarcode());
+					if(ti.getTousseDefinition() != null){
+						tousseDefId = ti.getTousseDefinition().getId();
+					}
+				}
 				item.setTousseInstanceId(tousseId);
 			}
+			
 			long tousseDefinitionId = json.optLong("tousseDefinitionId");
 			if(DatabaseUtil.isPoIdValid(tousseDefinitionId)){
 				item.setTousseDefinitionId(tousseDefinitionId);
 			}else{
-				TousseInstance ti = tousseInstanceManager.get(tousseId);
-				if(ti != null && ti.getTousseDefinition() != null){
-					item.setTousseDefinitionId(ti.getTousseDefinition().getId());
-					item.setTousseBarcode(ti.getBarcode());
-				}
+				item.setTousseDefinitionId(tousseDefId);
 			}
 			item.setIdCardBarcode(json.optString("idCardBarcode"));
 			item.setTousseName(json.optString("tousseName"));