Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
===================================================================
diff -u -r30121 -r33275
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js	(.../printConfig.js)	(revision 30121)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js	(.../printConfig.js)	(revision 33275)
@@ -258,31 +258,32 @@
     	            // 页眉名称
     	            //{label : "成都五冶医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
     	            // 标题
-    	            {label : "珠江医院物品出库单", dataIndex : '', fontSize : 15, position : ["5","32%","99%",5]},
+    	            {label : "珠江医院物品出库单", dataIndex : '', fontSize : 15, position : ["5","35%","99%",5]},
     	            {label : "科室:", dataIndex : 'depart', fontSize : 11, position : ["30","2%","90%",5]},
-    	            {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["30","25%","90%",5]},
-    	            {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","58%","90%",5]},
-    	            {label : "出库单号:", dataIndex : 'serialNumber2', fontSize : 11, position : ["30","80%","90%",5]},
+    	            {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","25%","90%",5]},
+    	            {label : "出库单号:", dataIndex : 'serialNumber2', fontSize : 11, position : ["30","50%","90%",5]},
+					{label : "申请单号:", dataIndex : 'invoiceSerialNumbers', fontSize : 11, position : ["30","68%","90%",5]},
+					{label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["50","2%","90%",5]},
     	            //页脚
     	            {label : "制单日期:", dataIndex : 'printDate', fontSize : 11, position : ["310","2%","90%",5]},
     	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["310","25%","90%",5]},
             	    {label : "领用人:", dataIndex : '', fontSize : 11, position : ["310","45%","90%",5]},
             	    {label : "保管人:", dataIndex : '', fontSize : 11, position : ["310","65%","90%",5]},
             	    {label : "记账人:", dataIndex : 'sender', fontSize : 11, position : ["310","80%","90%",5]}
     	        ],
-    	        currentPageNumber : {label : "第#页", fontSize : 11, position : ["30","45%","90%",5]},
-    	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["30","50%","90%",5]},
+    	        currentPageNumber : {label : "第#页", fontSize : 11, position : ["330","45%","90%",5]},
+    	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["330","50%","90%",5]},
     	        goodsTable :{
     	        	rowHeight : 20,
-    	        	position : ["50","1%","98%","6.5cm"],
+    	        	position : ["70","1%","98%","6.5cm"],
     	        	headRepeat : true,
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : 50, align : 'center', fontSize : 11},
     	                {header : "名称", dataIndex : 'name', width : 235, align : 'center', fontSize : 11},
     	                {header : "规格", dataIndex : 'specification', width : 150, align : 'center', fontSize : 11},
 //    	                {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11},
     	                {header : "单位", dataIndex : 'unit', width : 50, align : 'center', fontSize : 11},
-    	                {header : "数量", dataIndex : 'amount', width : 50, align : 'right', fontSize : 11},
+    	                {header : "数量", dataIndex : 'amount', width : 50, align : 'center', fontSize : 11},
     	                {header : "有效日期", dataIndex : 'expireDate', width : 100, align : 'center', fontSize : 11},
     	                {header : "批号", dataIndex : 'batchNumber', width : 120, align : 'center', fontSize : 11}
 //    	                {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11},
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r32186 -r33275
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 32186)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 33275)
@@ -37,6 +37,7 @@
 	    {name : 'diposable'},
 	    {name : 'price'},
 	    {name : 'fluctuationPrice'},
+		{name : 'invoicePlanSerialNumber'},
 	    {name : 'storage'},
 	    {name : 'batchNumber'},
 	    {name : 'sterilizerName'},
@@ -164,6 +165,7 @@
     {name : 'diposable'},
     {name : 'price'},
     {name : 'fluctuationPrice'},
+	{name : 'invoicePlanSerialNumber'},
     {name : 'storage'},
     {name : 'batchNumber'},
     {name : 'tousseType'},
@@ -613,6 +615,7 @@
 				}
 			})
 		},
+		{header : "申请单号",dataIndex : 'invoicePlanSerialNumber',width : 50,menuDisabled : true},
 		{header : "发货类型",dataIndex : 'type',width : 40,menuDisabled : true}
 	]);
 
@@ -2667,6 +2670,9 @@
 		{header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor,hidden:isPrintHidden},
 		{header : "发货单号集合码",width : 140,renderer : renderSerialNumbers,hidden:invoiceSerialNumberSetBarcodeHidden},
 		{header : "申请科室",width : 120,dataIndex : 'depart',hidden:departHidden},
+		{header : "申请单号",width : 120,dataIndex : 'invoicePlanSerialNumber',hidden:departHidden,renderer : function(v, p, record){
+			return record.json.invoicePlan.serialNumber;
+		}},
 		{header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute,hidden:sendTimeHidden},
 		{header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute,hidden:applicationTimeHidden},
 		{header : "回收时间",width : 120,dataIndex : 'recyclingTime',renderer : myDateFormatByMinute,hidden:recyclingTimeHidden},
@@ -2715,6 +2721,7 @@
 	    {name : 'receiptingTime'},
 		{name : 'signStatus'},
 	    {name : 'personInCharge'},
+		{name : 'invoicePlanSerialNumber'},
 	    {name : 'warehouseName'},
 	    {name : 'applicant'},
 	    {name : 'personInChargeCode'},