Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
===================================================================
diff -u -r17603 -r17610
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java	(.../TousseTransitionRecordManagerImpl.java)	(revision 17603)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java	(.../TousseTransitionRecordManagerImpl.java)	(revision 17610)
@@ -340,17 +340,6 @@
 					String tousseName = item.getTousseName();							
 					jsonItem.put("tousseName", tousseName);
 					jsonItem.put("amount", item.getAmount());
-					Integer prepareRecycleAmount = item.getPrepareRecycleAmount();
-					if(prepareRecycleAmount == null){
-						//版本为2并且启用了标识牌,那预回收数量就是0,否则就是申请数量
-						if("2".equals(tousseTransitionVersion) && tousseDefinitionManager.isThereIDCard(td)){
-							prepareRecycleAmount = 0;
-						}else{
-							prepareRecycleAmount = item.getAmount();
-						}
-					}
-					jsonItem.put("prepareRecycleAmount",prepareRecycleAmount);
-					jsonItem.put("tousseType", tousseType);
 					JSONArray barcodes = tousseTransitionItemManager.getJsonArray(item);
 					int scanedAmount = 0;
 					int unscanedAmount = 0;
@@ -364,6 +353,21 @@
 					}else{
 						unscanedAmount = item.getUnscanedAmount();
 					}
+					Integer prepareRecycleAmount = item.getPrepareRecycleAmount();
+					if(prepareRecycleAmount == null){
+						//版本为2并且启用了标识牌,那预回收数量就是0,否则就是申请数量
+						if("2".equals(tousseTransitionVersion) && tousseDefinitionManager.isThereIDCard(td)){
+							prepareRecycleAmount = 0;
+						}else{
+							prepareRecycleAmount = item.getAmount();
+						}
+						if(prepareRecycleAmount > 0 && prepareRecycleAmount > scanedAmount){
+							unscanedAmount = MathTools.sub(prepareRecycleAmount, scanedAmount).intValue();
+						}
+					}
+					jsonItem.put("prepareRecycleAmount",prepareRecycleAmount);
+					jsonItem.put("tousseType", tousseType);
+					
 					jsonItem.put("scanedAmount", scanedAmount);
 					jsonItem.put("unscanedAmount", unscanedAmount);
 					jsonItem.put("tousseDefineId", item.getTousseDefinitionId());