Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r31077 -r31215
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 31077)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 31215)
@@ -1690,6 +1690,22 @@
 						map.put("receiptingTime", StringTools.defaultString(invoice.getReceiptingTime_YYYYMMDDHHMM()));
 					}
 				}
+				
+				// 如果发货单的物品来源于多张申请单，需要把所有申请单的单号条码都打印出来SZYK-37
+				List<Invoice> invoiceList = invoiceManager.getCollection(idsStr, ",");
+				if(CollectionUtils.isNotEmpty(invoiceList)){
+					String invoiceSerialNumbers = "";
+					for (Invoice invoice : invoiceList) {
+						String serialNumber = invoice.getSerialNumber();
+						if (StringUtils.isBlank(invoiceSerialNumbers)) {
+							invoiceSerialNumbers = serialNumber;
+						} else {
+							invoiceSerialNumbers += ";" + serialNumber;
+						}
+					}
+					map.put("invoiceSerialNumbers", invoiceSerialNumbers);
+				}
+				
 				//获取第一张核对人不为空的单,把核对员打到单上
 				map.put("assistantSender", StringTools.defaultIfBlank(invoiceManager.getFirstAssistant(idStrs),""));
 				map.put("personInCharge", StringTools.defaultIfBlank(invoiceManager.getFirstPersonIncharge(idStrs),""));