Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r33086 -r33364
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 33086)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 33364)
@@ -2440,6 +2440,18 @@
 						height : 40,
 						readOnly:true
 					}]
+				},{
+					layout : 'form',
+					columnWidth : 1,
+					labelWidth :120,
+					items : [{
+						xtype : 'textarea',
+						fieldLabel : '发货备注',
+						id : 'invoiceRemark',
+						name : 'invoiceRemark',
+						anchor : '98.5%',
+						height : 40
+					}]
 				}]
 			}]
 		},{
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java
===================================================================
diff -u -r29661 -r33364
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 29661)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/invoice/service/SubmitInvoiceContext.java	(.../SubmitInvoiceContext.java)	(revision 33364)
@@ -99,8 +99,13 @@
 	 * 核对人
 	 */
 	private String assistantSender = "";
-	
+
 	/**
+	 * 备注,暂仅用于保存发货计划里的发货备注
+	 */
+	private String invoiceRemark;
+
+	/**
 	 * 前台传过来的参数
 	 */
 	private JSONObject params;
@@ -694,5 +699,12 @@
 		this.writeBackInvoiceList = writeBackInvoiceList;
 	}
 
-	
+	public String getInvoiceRemark() {
+		return invoiceRemark;
+	}
+
+	public void setInvoiceRemark(String invoiceRemark) {
+		this.invoiceRemark = invoiceRemark;
+	}
+
 }
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
===================================================================
diff -u -r32103 -r33364
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 32103)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 33364)
@@ -1097,7 +1097,7 @@
 						xtype : 'textarea',
 						fieldLabel : '备注',
 						id : 'remark2',
-						name : 'remark',
+						name : 'invoiceRemark',
 						anchor : '98.5%',
 						height : 40
 					}]
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r33311 -r33364
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33311)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 33364)
@@ -2990,6 +2990,8 @@
 		String sender = params.optString("sender");
 		String sourceWarehouseId = JSONUtil.optString(params, "sourceWarehouseId", "");
 		String sourceWarehouseName = JSONUtil.optString(params, "sourceWarehouseName", "");
+		//发货备注
+		String invoiceRemark = JSONUtil.optString(params, "invoiceRemark", "");
 		boolean allowPartlyInvoiceForeignTousse = CssdUtils.getSystemSetConfigByNameBool("allowPartlyInvoiceForeignTousse");
 		allowPartlyInvoiceForeignTousse = JSONUtil.optBoolean(params, "allowPartlyInvoiceForeignTousse", allowPartlyInvoiceForeignTousse);
 		submitInvoiceContext.setAllowPartlyInvoiceForeignTousse(allowPartlyInvoiceForeignTousse);
@@ -3021,6 +3023,7 @@
 		submitInvoiceContext.setSourceWarehouseId(sourceWarehouseId);
 		submitInvoiceContext.setSourceWarehouse(wareHouseManager.getWareHouseById(sourceWarehouseId));
 		submitInvoiceContext.setSourceWarehouseName(sourceWarehouseName);
+		submitInvoiceContext.setInvoiceRemark(invoiceRemark);
 		submitInvoiceContext.setParams(params);
 		JSONArray jsonArrayInvoiceItems = params.optJSONArray("invoiceItems");
 		
@@ -4383,6 +4386,7 @@
 		invoice.setDepartCoding(departCoding);
 		invoice.setSettleAccountsDepart(settleAccountsDepart);
 		invoice.setSettleAccountsDepartCoding(settleAccountsDepartCoding);
+		invoice.setRemark(submitInvoiceContext.getInvoiceRemark());
 		boolean containUrgent = false; 
 		for (InvoiceItem invoiceItem : invoiceItems) {
 			// 先保存invoiceItem，以后需要invoiceItemID
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r33285 -r33364
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 33285)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 33364)
@@ -2500,6 +2500,8 @@
 		params.put("personInChargeCode", personInChargeCode);
 		params.put("sourceWarehouseId", sourceWarehouseId);
 		params.put("sourceWarehouseName", sourceWarehouseName);
+		//发货的备注(用户可以输入的内容)
+		params.put("invoiceRemark", StrutsParamUtils.getPraramValue("invoiceRemark", ""));
 		JSONArray sendOutGoodsItems = JSONArray.fromObject(sendOutGoodsStoreData);
 //		List<ScanGoodsVo> voList = getInvoiceGoodsVo(sendOutGoodsStoreData);
 		params.put("invoiceItems", sendOutGoodsItems);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java
===================================================================
diff -u -r32588 -r33364
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 32588)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceOptimizeManagerImpl.java	(.../InvoiceOptimizeManagerImpl.java)	(revision 33364)
@@ -138,6 +138,8 @@
 		String depart = JSONUtil.optString(params, "depart", "");
 		String personInCharge = JSONUtil.optString(params, "personInCharge", "");
 		String personInChargeCode = JSONUtil.optString(params, "personInChargeCode", "");
+		//发货备注
+		String invoiceRemark = JSONUtil.optString(params, "invoiceRemark", "");
 		JSONArray invoiceItems = params.optJSONArray("invoiceItems");
 		//日期,格式为开始日期;结束日期。开始日期和结果的格式为yyyy-MM-dd
 		String applyDate = JSONUtil.optString(params, "applyDate", "");
@@ -4806,7 +4808,9 @@
 				ps.setString(9, params.optString("personInCharge"));
 				ps.setString(10, params.optString("personInChargeCode"));
 				ps.setTimestamp(11, new Timestamp(currentDateTime.getTime()));
-				ps.setString(12, invoicePlan.getRemark());
+				//ps.setString(12, invoicePlan.getRemark());
+				//GDSZYY-107 PC端发货计划增加【发货备注】并支持在发货管理模块进行查看
+				ps.setString(12, params.optString("invoiceRemark"));
 				ps.setString(13, invoicePlan.getApplicant());
 				ps.setTimestamp(14, new Timestamp(invoicePlan.getApplicationTime().getTime()));
 				if(invoicePlan.getRecyclingTime() != null){