Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
===================================================================
diff -u -r20984 -r22201
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 20984)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js	(.../printConfig.js)	(revision 22201)
@@ -222,15 +222,17 @@
 	    fixed : true,//表格宽度固定
 	    headerFooter : [
 	                    // 标题
-	                    {label : "中山大学附属第一医院", dataIndex : '', position : ["0","1%","99%",5],type: 'html', beforeStr: "<table align='center'><tr><td align='center' style='font:24px'>", afterStr: "</td></tr></table>"},
-	                    {label : "供应室出库清单", dataIndex : '', position : ["30","1%","99%",5],type: 'html', beforeStr: "<table align='center'><tr><td align='center' style='font:22px'>", afterStr: "</td></tr></table>"},
-	                    {label : "科室:", dataIndex : 'depart', fontSize : 13, position : ["60","1%","90%",5]},
-						{label : "日期:", dataIndex : 'applicationTime', fontSize : 13, position : ["60","25%","90%",5]},	                    
-	                    {label : "单号:", dataIndex : 'serialNum', fontSize : 13, position : ["60","50%","90%",5]},
-					    {label : "备注:", dataIndex : 'remark', fontSize : 13, position : ["60","72%","90%",5]},
-	                    {label : "配包人:", dataIndex : '', fontSize : 13, position : ["8cm","5%","90%",5],onlyLast:true},
-	                    {label : "发货人:", dataIndex : '', fontSize : 13, position : ["8cm","25%","90%",5],onlyLast:true},
-	                    {label : "领物人:", dataIndex : '', fontSize : 13, position : ["8cm","55%","90%",5],onlyLast:true},
+	                    {label : "中山大学附属第一医院", dataIndex : '', position : ["0","1%","99%",5],type: 'html', beforeStr: "<table align='center'><tr><td align='center' style='font:20px'>", afterStr: "</td></tr></table>"},
+	                    {label : "供应室出库清单", dataIndex : '', position : ["28","1%","99%",5],type: 'html', beforeStr: "<table align='center'><tr><td align='center' style='font:18px'>", afterStr: "</td></tr></table>"},
+	                    {label : "科室:", dataIndex : 'depart', fontSize : 12, position : ["60","0%","90%",5]},
+						{label : "日期:", dataIndex : 'printTime', fontSize : 12, position : ["60","20%","90%",5]},	                    
+	                    {label : "单号:", dataIndex : 'serialNum', fontSize : 12, position : ["60","50%","90%",5]},
+					    {label : "备注:", dataIndex : 'remark', fontSize : 12, position : ["60","70%","90%",5]},
+	                    {label : "发货:", dataIndex : '', fontSize : 13, position : ["7.5cm","0%","90%",5],onlyLast:true},
+	                    {label : "核对:", dataIndex : '', fontSize : 13, position : ["7.5cm","12%","90%",5],onlyLast:true},
+	                    {label : "运送员:", dataIndex : '', fontSize : 13, position : ["7.5cm","25%","90%",5],onlyLast:true},
+						{label : "科室签收:", dataIndex : '', fontSize : 13, position : ["7.5cm","45%","90%",5],onlyLast:true},
+						{label : "送达时间:", dataIndex : '', fontSize : 13, position : ["7.5cm","65%","90%",5],onlyLast:true},
 	                    {barcodes : [
 	                 				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["5","70%","40mm","8mm"],
 	                 					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: false},
@@ -240,19 +242,19 @@
 	                 			    }
 	                 		    ]}
 	    ],
-		currentPageNumber : {label : "第#页 ", fontSize : 11, position : ["8cm","75%","90%",5]},
-        totalPageAmount : {label : " / 共#页", fontSize : 11, position : ["8cm","80%","90%",5]},
+		currentPageNumber : {label : "第#页 ", fontSize : 11, position : ["7.5cm","88%","90%",5]},
+        totalPageAmount : {label : " / 共#页", fontSize : 11, position : ["7.5cm","92%","90%",5]},
 	        goodsTable :{
-	        	rowHeight : 55,
+	        	rowHeight : 50,
 	        	position : ["80","0%","100%","5cm"],
-			fontSize : 16,
+			fontSize : 14,
         	headRepeat : true,
 	        	columns : [
 	        	            {header : "编码", dataIndex : 'externalCode', width : 100, align : 'center', fontSize : 11},
-	        	            {header : "名称", dataIndex : 'goodsName', width : 450, align : 'center', fontSize : 8},
+	        	            {header : "名称", dataIndex : 'goodsName', width : 420, align : 'center', fontSize : 8},
 	        	          //{header : "规格", dataIndex : 'sp', width : 100, align : 'center', fontSize : 11},
 	        	            {header : "数量", dataIndex : 'goodsAmount', width : 50, align : 'center', fontSize : 14},
-	        	           // {header : "单位", dataIndex : 'unit', width : 50, align : 'center', fontSize : 14},
+	        	            {header : "单位", dataIndex : 'unit', width : 50, align : 'center', fontSize : 14},
 	        	            {header : "单价", dataIndex : 'price', width : 50, align : 'center', fontSize : 14},
 	        	            {header : "金额", dataIndex : 'rowPrice', width : 80, align : 'center', fontSize : 14}
 	        	        ]
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r22167 -r22201
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 22167)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 22201)
@@ -248,6 +248,8 @@
   enableReturnGoodsByInvoicePlan: true,
   //消毒供应中心领用单批次选项是否显示库存为0的批次
   notShowZeroStorage: true,
+  //不覆盖发货计划的打印时间
+  overWriteInvoicePlanPrintTime:false,
   //科室申领中，是否重复打印当天已经打印的申领物品
   reprintTodayPrintedTousseItem : true,
   //科室申领中，是否启用打印选中物品