Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
===================================================================
diff -u -r33364 -r33440
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 33364)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 33440)
@@ -4810,7 +4810,8 @@
 				ps.setTimestamp(11, new Timestamp(currentDateTime.getTime()));
 				//ps.setString(12, invoicePlan.getRemark());
 				//GDSZYY-107 PC端发货计划增加【发货备注】并支持在发货管理模块进行查看
-				ps.setString(12, params.optString("invoiceRemark"));
+				String invoiceRemark = getFinalInvoiceRemark(invoicePlan , params.optString("invoiceRemark"));
+				ps.setString(12, invoiceRemark);
 				ps.setString(13, invoicePlan.getApplicant());
 				ps.setTimestamp(14, new Timestamp(invoicePlan.getApplicationTime().getTime()));
 				if(invoicePlan.getRecyclingTime() != null){
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r33439 -r33440
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33439)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33440)
@@ -4386,7 +4386,6 @@
 		invoice.setDepartCoding(departCoding);
 		invoice.setSettleAccountsDepart(settleAccountsDepart);
 		invoice.setSettleAccountsDepartCoding(settleAccountsDepartCoding);
-		invoice.setRemark(submitInvoiceContext.getInvoiceRemark());
 		boolean containUrgent = false; 
 		for (InvoiceItem invoiceItem : invoiceItems) {
 			// 先保存invoiceItem，以后需要invoiceItemID
@@ -4885,17 +4884,8 @@
 		}
 
 		invoice.setAssistantSender(submitInvoiceContext.getAssistantSender());
-		if (invoicePlan != null) {
-			if (invoicePlan instanceof RecyclingApplication) {
-				RecyclingApplication application = (RecyclingApplication) invoicePlan;
-				String remark = invoice.getRemark();
-				if(StringUtils.isBlank(remark)){
-					invoice.setRemark(application.getRemark());
-				}else{
-					invoice.setRemark(remark + "；" + application.getRemark());
-				}
-			}
-		}
+		//设置发货单备注
+		invoice.setRemark(getFinalInvoiceRemark(invoicePlan,submitInvoiceContext.getInvoiceRemark()));
 
 		invoice.setSender(submitInvoiceContext.getSender());
 		invoice.setPersonInCharge(personInCharge);
@@ -4928,6 +4918,24 @@
 	}
 
 	/**
+	 * 获取发货单的最终备注(部分类型的申请单,发货后会将申请单的备注拼接在发货页面所填的备注后面)
+	 * @param invoicePlan 发货计划
+	 * @param invoiceRemark 发货的备注
+	 */
+	protected String getFinalInvoiceRemark(InvoicePlan invoicePlan , String invoiceRemark){
+		String finalInvoiceRemark = null;
+		if (invoicePlan != null) {
+			if (invoicePlan instanceof RecyclingApplication) {
+				String remark = invoicePlan.getRemark();
+				if(StringUtils.isNotBlank(remark)){
+					finalInvoiceRemark = StringUtils.defaultString(invoiceRemark,"") + "；" + remark;
+				}
+			}
+		}
+		return finalInvoiceRemark;
+	}
+
+	/**
 	 * @param submitInvoiceContext
 	 * @param identification
 	 * @param diposableGoodBatch