Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js
===================================================================
diff -u -r40855 -r40970
--- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 40855)
+++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js	(.../printApplicationGoods.js)	(revision 40970)
@@ -166,26 +166,51 @@
 	return;
 }
 
-//GDSKQYY-16：批量打印发货计划2
+//GDSKQYY-16：批量打印发货计划2(GDSKQYY-18：改进)
 function commonEquipmentDeliveryPlanList2(printData) {
 	var title = '';
-	var goodCount = 0;
+	var departHtml = '';
 	var date = new Date();
 	var printTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + timeformat(date.getHours()) + ":" + timeformat(date.getMinutes());
-	var departHtml = '<tr><td style="padding: 5px;">科室（诊位）名称</td><td style="padding: 5px;">待发物品总数</td></tr>';
 	for (var i = 0; i < printData.data.length; i++) {
 		title = printData.data[i].header;
 		var totalGoodsAmount = printData.data[i].totalGoodsAmount;
 		var depart = printData.data[i].depart;
+		var pages = printData.data[i].pages;
 		departHtml += '<tr>'
-		departHtml += '<td style="padding: 5px;">' + depart + '</td><td style="padding: 5px;">' + totalGoodsAmount + '</td>';
+		departHtml += '<td style="padding: 5px;font-weight: bold;">' + depart + '</td><td style="padding: 5px;text-align: right;font-weight: bold;">小计 ' + totalGoodsAmount + '</td>';
 		departHtml += '</tr>'
-		goodCount += totalGoodsAmount;
+		if (pages[0] && pages[0].rows.length > 0) {
+			for (var j = 0; j < pages[0].rows.length; j += 2) {
+				var goodsName = pages[0].rows[j].goodsName;
+				var goodsAmount = pages[0].rows[j].goodsAmount;
+				departHtml += '<tr>'
+				if (j == 0) {
+					departHtml += '<td style="padding: 5px;border-right: 1px solid #000;border-top: 1px solid #000;">' + goodsName + ' - (' + goodsAmount + ')</td>';
+					if (pages[0].rows[j + 1]) {
+						var goodsName = pages[0].rows[j + 1].goodsName;
+						var goodsAmount = pages[0].rows[j + 1].goodsAmount;
+						departHtml += '<td style="padding: 5px;border-top: 1px solid #000;">' + goodsName + ' - (' + goodsAmount + ')</td>';
+					} else {
+						departHtml += '<td style="padding: 5px;border-top: 1px solid #000;"></td>';
+					}
+				} else {
+					departHtml += '<td style="padding: 5px;border-right: 1px solid #000;">' + goodsName + ' - (' + goodsAmount + ')</td>';
+					if (pages[0].rows[j + 1]) {
+						var goodsName = pages[0].rows[j + 1].goodsName;
+						var goodsAmount = pages[0].rows[j + 1].goodsAmount;
+						departHtml += '<td style="padding: 5px;">' + goodsName + ' - (' + goodsAmount + ')</td>';
+					} else {
+						departHtml += '<td style="padding: 5px;"></td>';
+					}
+				}
+				departHtml += '</tr>'
+			}
+		}
 	}
-	departHtml += '<tr><td style="padding: 5px;">合计</td><td style="padding: 5px;">' + goodCount + '</td></tr>';
 	var tableHtml = "<p style='text-align: center;padding-bottom: 20px;'>" + title + "待发物品总数单</p>";
 	tableHtml += "<p>打印时间：" + printTime + "</p>";
-	tableHtml += "<table border =1 cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
+	tableHtml += "<table border = 0 cellspacing=0 cellpadding=0 style='border-collapse:collapse;' bordercolor='#000000'>";
 	tableHtml += departHtml
 	tableHtml += "</table>";
 	var LODOP = getLodop(document.getElementById('LODOP'), document.getElementById('LODOP_EM'));