Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js
===================================================================
diff -u -r12981 -r13036
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js	(.../printConfig.js)	(revision 12981)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js	(.../printConfig.js)	(revision 13036)
@@ -453,10 +453,10 @@
     headerFooter : [
     	            // 标题
     	            {label : "广州复大肿瘤医院一次性物品采购计划", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]},
-    	            {label : "入库类型：购入入库", dataIndex : '', fontSize : 9, position : ["0.5cm","2%","90%",5]},
-    	            {label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1cm","2%","90%",5]},
-    	            {label : "入库日期：", dataIndex : 'godownEntryTime', fontSize : 9, position : ["1cm","53%","90%",5]},
-    	            {label : "入库单号：", dataIndex : 'serialNumber', fontSize : 9, position : ["1cm","75%","90%",5]},
+    	            //{label : "入库类型：购入入库", dataIndex : '', fontSize : 9, position : ["0.5cm","2%","90%",5]},
+    	            //{label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1cm","2%","90%",5]},
+    	            {label : "操作日期：", dataIndex : 'godownEntryTime', fontSize : 9, position : ["1cm","2%","90%",5]},
+    	            {label : "单号：", dataIndex : 'serialNumber', fontSize : 9, position : ["1cm","75%","90%",5]},
     	            {label : "小计:   ", dataIndex : 'totalPrice', fontSize : 9, position : ["7.5cm","2%","90%",4]},
             	    {label : "制单日期:", dataIndex : 'printTime', fontSize : 9, position : ["8cm","2%","90%",4]},
             	    {label : "制单人:", dataIndex : 'printUser', fontSize : 9, position : ["8cm","25%","90%",4]},
@@ -474,15 +474,16 @@
     	        	headRepeat : true,
     	        	columns : [
     	        	    {header : "编码", dataIndex : 'code', width : '35', align : 'center'},
-    	                {header : "名称", dataIndex : 'name', width : '170', align : 'left'},
+    	                {header : "名称", dataIndex : 'name', width : '140', align : 'center'},
     	                {header : "规格", dataIndex : 'specification', width : '100', align : 'center'},
     	                {header : "单位", dataIndex : 'unit', width : '30', align : 'center'},
     	                {header : "数量", dataIndex : 'amount', width : '30', align : 'center'},
     	                {header : "进价", dataIndex : 'price', width : '40', align : 'right'},
     	                {header : "进价金额", dataIndex : 'totalPrice', width : '50', align : 'right'},
-    	                {header : "批号", dataIndex : 'batchNumber', width : '60', align : 'right'},
+    	                //{header : "批号", dataIndex : 'batchNumber', width : '60', align : 'right'},
     	                {header : "产地", dataIndex : 'producingArea', width : '50', align : 'right'},
-    	                {header : "注册证号", dataIndex : 'certification', width : '180', align : 'left'}
+    	                {header : "供应商", dataIndex : 'supplierName', width : '150', align : 'center'},
+    	                {header : "注册证号", dataIndex : 'certification', width : '140', align : 'left'}
     	            ]
     	        }
 }
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java
===================================================================
diff -u -r13017 -r13036
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java	(.../GoodPurchasePlanManagerImpl.java)	(revision 13017)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GoodPurchasePlanManagerImpl.java	(.../GoodPurchasePlanManagerImpl.java)	(revision 13036)
@@ -337,38 +337,38 @@
 	
 	// 找出已经存在项
 	private Collection<GodownEntryItemPrintVO> loadToussePrintData(
-		Collection<GoodPurchasePlan> plans) {
-	if (CollectionUtils.isEmpty(plans)) {
-		return CollectionUtils.emptyCollection();
-	}
-
-	List<GodownEntryItemPrintVO> voList = new ArrayList<GodownEntryItemPrintVO>();
-	for (GoodPurchasePlan plan : plans) {
-		List<GoodPurchaseItem> items = plan.getItemsList();
-		for (GoodPurchaseItem item : items) {
-			JSONObject obj = CssdUtils.getMaterialNameAndSp(item.getName());
-			DisposableGoods diposableGoods = diposableGoodsManager
-						.getDisposableGoodsByName(
-								obj.optString("materialName"),
-								obj.optString("specification"));
-			GodownEntryItemPrintVO tempVo = new GodownEntryItemPrintVO();
-			tempVo.setCode(diposableGoods.getExternalCode());
-			tempVo.setAmount(Long.valueOf(item.getScheduleAmout()));
-			tempVo.setName(diposableGoods.getName());
-			tempVo.setSpecification(diposableGoods.getSpecification());
-			tempVo.setInventorySerialNumber(diposableGoods.getInventorySerialNumber());
-			tempVo.setUnit(diposableGoods.getUnit());
-			tempVo.setPrice(item.getPurchase());
-			tempVo.setRowPrice(item.getTotalPrice());
-			tempVo.setTotalPrice(tempVo.getRowPrice());
-			tempVo.setBatchNumber("");
-			tempVo.setCertification(diposableGoods.getCertification());
-			voList.add(tempVo);
+			Collection<GoodPurchasePlan> plans) {
+		if (CollectionUtils.isEmpty(plans)) {
+			return CollectionUtils.emptyCollection();
 		}
+	
+		List<GodownEntryItemPrintVO> voList = new ArrayList<GodownEntryItemPrintVO>();
+		for (GoodPurchasePlan plan : plans) {
+			List<GoodPurchaseItem> items = plan.getItemsList();
+			for (GoodPurchaseItem item : items) {
+				JSONObject obj = CssdUtils.getMaterialNameAndSp(item.getName());
+				DisposableGoods diposableGoods = diposableGoodsManager
+							.getDisposableGoodsByName(
+									obj.optString("materialName"),
+									obj.optString("specification"));
+				GodownEntryItemPrintVO tempVo = new GodownEntryItemPrintVO();
+				tempVo.setCode(diposableGoods.getExternalCode());
+				tempVo.setAmount(Long.valueOf(item.getScheduleAmout()));
+				tempVo.setName(diposableGoods.getName());
+				tempVo.setSpecification(diposableGoods.getSpecification());
+				tempVo.setInventorySerialNumber(diposableGoods.getInventorySerialNumber());
+				tempVo.setUnit(diposableGoods.getUnit());
+				tempVo.setPrice(item.getPurchase());
+				tempVo.setRowPrice(item.getTotalPrice());
+				tempVo.setTotalPrice(tempVo.getRowPrice());
+				tempVo.setBatchNumber("");
+				tempVo.setCertification(diposableGoods.getCertification());
+				tempVo.setSupplierName(item.getSupplierName());
+				voList.add(tempVo);
+			}
+		}
+		return voList;
 	}
-
-	return voList;
-}
 	
 	/**
 	 * 根据名称与规格查找最近一次的采购明细