Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r33902 -r33925
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 33902)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 33925)
@@ -810,6 +810,7 @@
 									task.setDepartment(application.getDepart());
 									task.setDepartCoding(application.getDepartCoding());
 									task.setSettleAccountsDepartCoding(application.getSettleAccountsDepartCoding());
+									task.setRemarkOfApplyGoods(tousseIdAndAmount.get(tousseId).getRemarkOfApplyGoods());
 									packingManager.save(task);
 								} else {
 									throw new RecyclingRecordException(
@@ -821,6 +822,7 @@
 											+ needAddAmount);
 									task.setUnPackAmount(task.getUnPackAmount()
 											+ needAddAmount);
+									task.setRemarkOfApplyGoods(tousseIdAndAmount.get(tousseId).getRemarkOfApplyGoods());
 								} else if (task.getUnPackAmount()
 										+ needAddAmount == 0) {
 									packingManager.delete(task,"保存或更新回收申请单");
@@ -832,6 +834,18 @@
 							}
 						}
 					}
+				}else if(ConfigUtils.getSystemSetConfigByNameBool("enableApplyGoodsRemarkFunction", false)){
+					//ZJYY-95 申请单增加独立填写物品申领备注功能
+					TousseDefinition td = tousseDefinitionManager.get(tousseId);
+					if (td != null) {
+						PackingTask task = packingManager
+								.getUnfinishedTask(application.getId(),
+										null, td.getId(),
+										PackingTask.TASK_APPLICATION);
+						if(task != null){
+							task.setRemarkOfApplyGoods(tousseIdAndAmount.get(tousseId).getRemarkOfApplyGoods());
+						}
+					}
 				}
 			}
 		}
@@ -975,6 +989,7 @@
 			tousseItem.setUrgentAmount(item.getUrgentAmount());
 			tousseItem.setUrgentLevel(item.getUrgentLevel());
 			tousseItem.setUrgentLevelObj(item.getUrgentLevelObj());
+			tousseItem.setRemarkOfApplyGoods(item.getRemarkOfApplyGoods());
 			tousseIdAndMap.put(td.getId(),tousseItem);
 		}
 	} 
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r33902 -r33925
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33902)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33925)
@@ -821,8 +821,7 @@
 						
 						//ZJYY-95如果需要打印出【备注】信息，并且物品有备注，就不合并
 						if(isMergeRemark && tempVo != null){
-							if(StringUtils.isNotBlank(tousseInstance.getRemark())
-									|| StringUtils.isNotBlank(tempVo.getRemark())){
+							if(!StringUtils.equals(tousseInstance.getRemark(), tempVo.getRemark())){
 								tempVo = null;
 							}
 						}
@@ -1007,8 +1006,7 @@
 						if(isMergeRemark && tempVo != null){
 							//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 							//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-							if(applyRemarkMap.get(key) != null
-									|| StringUtils.isNotBlank(tempVo.getRemark())){
+							if(!StringUtils.equals(applyRemarkMap.get(key), tempVo.getRemark())){
 								tempVo = null;
 							}
 						}
@@ -9171,8 +9169,7 @@
 		//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 		//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95 
 		if(isMergeRemark && invoicePrintVo != null
-				 && (StringUtils.isNotBlank(tousseInstance.getRemark())
-						|| StringUtils.isNotBlank(invoicePrintVo.getRemark()))){
+				 && !StringUtils.equals(tousseInstance.getRemark(), invoicePrintVo.getRemark())){
 			return null;
 		}
 		
@@ -10519,8 +10516,7 @@
 				if(isMergeRemark && tempVo != null){
 					//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 					//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-					if(applyRemarkMap.get(key) != null
-							|| StringUtils.isNotEmpty(tempVo.getRemark())){
+					if(!StringUtils.equals(applyRemarkMap.get(key), tempVo.getRemark())){
 						tempVo = null;
 					}
 				}
@@ -10703,8 +10699,7 @@
 				if(isMergeRemark && tempVo != null){
 					//打印发货单时，如果设置为多张发货单合并打印，多张单上的同名的物品，如果某物品有【备注】信息，
 					//则该物品不应与其它的同名物品合并打印，要单独作为一行打印。ZJYY-95
-					if(StringUtils.isNotBlank(tempVo.getRemark())
-							|| StringUtils.isNotBlank(expensiveGoodsApplyRemarkMap.get(key))){
+					if(!StringUtils.equals(tempVo.getRemark(), expensiveGoodsApplyRemarkMap.get(key))){
 						tempVo = null;
 					}
 				}