Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r15636 -r15749
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 15636)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 15749)
@@ -926,13 +926,7 @@
 			if (InvoicePlan.TYPE_COMBO_FORM.equals(applicationFormType) || InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION.equals(applicationFormType)) {
 				
 				if ( TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseItem.getTousseType())){
-					// Long itemId = tousseItem.getId();
-					// Integer itemAmount = tousseItem.getAmount();
-					// DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsById(tousseItem.getTousseDefinitionId().toString());
-					// JSONObject json = departmentAppTemplateManager.diposableItem2Json(itemId.toString(), itemAmount, disposableGoods, diposableFloatPercent);
-					// this.resetUnitAndCountAndRowPrice(tousseItem,json);
 					JSONObject json = this.getDiposableGoodMsg(tousseItem,diposableFloatPercent);
-
 					// 设置是否已经终止的状态的checkbox
 					boolean isTerminated = BooleanUtils.isTrue(tousseItem.getIsTerminated());
 					json.put("isTerminated", isTerminated);
@@ -972,11 +966,6 @@
 					
 					rightStoreJson.append(json.toString());
 				} else {
-					// Long itemId = tousseItem.getId();
-					// Integer itemAmount = tousseItem.getAmount();
-					// DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsById(tousseItem.getTousseDefinitionId().toString());
-					// JSONObject json = departmentAppTemplateManager.diposableItem2Json(itemId.toString(), itemAmount, disposableGoods, diposableFloatPercent);
-					// this.resetUnitAndCountAndRowPrice(tousseItem,json);
 					JSONObject json = this.getDiposableGoodMsg(tousseItem,diposableFloatPercent);
 					appendJsonString(rightStoreJson, json.toString());
 				}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r15742 -r15749
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 15742)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 15749)
@@ -2974,6 +2974,14 @@
 							tousseItem.setIsThereIdentificationCard(newItem.getIsThereIdentificationCard());
 							tousseItem.setInvoicePlan(existApplication);
 							tousseItem.setEditAmount(newItem.getEditAmount());
+
+                            tousseItem.setUnit(newItem.getUnit());
+                            //合并申请单时设置申领规格单位(中包装单位)和申领规格对应的数量
+                            tousseItem.setMiddlePackageUnit(newItem.getMiddlePackageUnit());
+                            tousseItem.setMiddlePackageAmount(newItem.getMiddlePackageAmount());
+							tousseItem.setTransferScale(newItem.getTransferScale());
+
+
 							needToBeAdded.add(tousseItem);
 							if (tousseItemDetails == null) {
 								tousseItemDetails = "【系统添加备注】新增["