Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceItemSummary.js
===================================================================
diff -u -r22870 -r23427
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceItemSummary.js	(.../invoiceItemSummary.js)	(revision 22870)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceItemSummary.js	(.../invoiceItemSummary.js)	(revision 23427)
@@ -27,7 +27,9 @@
 			    {name : 'displayName',mapping : 'displayName'}, 
 			    {name : 'batchNumber',mapping : 'batchNumber'}, 
 			    {name : 'amount',mapping : 'amount'},
+			    {name : 'amountWithUnit'},  //数量与单位一起，在load时给值，前台显示用
 			    {name : 'middlePackageUnitAmount'},
+			    {name : 'middlePackageUnitAmountWithUnit'},//申领数量与申领单位组合，前台显示用
 			    {name : 'unit'},
 			    {name : 'middlePackageUnit'}
 			   ]
@@ -37,20 +39,8 @@
 		var cm = new Ext.grid.ColumnModel([
       		    {id : 'displayName',header : "物品名称",dataIndex : 'displayName',width : 160, menuDisabled: true},
       		    {header : "批次",dataIndex : 'batchNumber',width : 60, menuDisabled: true},
-      		    {header : "数量(入库单位)",dataIndex : 'amount',width : 40, menuDisabled: true,renderer: function(v,p,record){
-      		    	var unit = record.data.unit;
-      		    	if(!isUndefinedOrNullOrEmpty(unit)){
-      		    		return v+' '+unit;
-      		    	}
-  					return v;
-  				}},
-  				{header : "数量(申领单位)",dataIndex : 'middlePackageUnitAmount',width : 40, menuDisabled: true,renderer: function(v,p,record){
-  					var middlePackageUnit = record.data.middlePackageUnit;
-      		    	if(!isUndefinedOrNullOrEmpty(v) && !isUndefinedOrNullOrEmpty(middlePackageUnit)){
-      		    		return v+' '+middlePackageUnit;
-      		    	}
-  					return '';
-  				}},
+      		    {header : "数量(入库单位)",dataIndex : 'amountWithUnit',width : 40, menuDisabled: true},
+  				{header : "数量(申领单位)",dataIndex : 'middlePackageUnitAmountWithUnit',width : 40, menuDisabled: true},
       		    {header : "操作",dataIndex : '',width : 20, menuDisabled: true,
       		    	renderer: function(v,p,record){
       					var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" title=\"删除\" onclick=\"getCurrentTab().InvoiceItemSummary.removeGridItem("+record.get('index')+") \">";
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceItemSummaryVo.java
===================================================================
diff -u -r22859 -r23427
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceItemSummaryVo.java	(.../InvoiceItemSummaryVo.java)	(revision 22859)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/InvoiceItemSummaryVo.java	(.../InvoiceItemSummaryVo.java)	(revision 23427)
@@ -83,6 +83,30 @@
 	public void setAmount(Integer amount) {
 		this.amount = amount;
 	}
+	/**
+	 * 
+	 * @return
+	 */
+	public String getAmountWithUnit(){
+		if(amount != null){
+			if(StringUtils.isNotBlank(unit)){
+				return String.format("%d %s", amount,unit);
+			}else{
+				return amount.toString();
+			}
+		}
+		return "";
+	}
+	public String getMiddlePackageUnitAmountWithUnit(){
+		if(middlePackageUnitAmount != null){
+			if(StringUtils.isNotBlank(middlePackageUnit)){
+				return String.format("%d %s", middlePackageUnitAmount,middlePackageUnit);
+			}else{
+				return middlePackageUnitAmount.toString();
+			}
+		}
+		return "";
+	}
 	public Long getGoodsId() {
 		return goodsId;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js
===================================================================
diff -u -r23237 -r23427
--- ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js	(.../printConfig.js)	(revision 23237)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js	(.../printConfig.js)	(revision 23427)
@@ -294,10 +294,11 @@
 	        	position : ["1.0cm","0.2cm","99%","28cm"],
 	        	headRepeat : true,
 	        	columns : [
-    	            {header : "物品名称", dataIndex : 'displayName', width : 500, align : 'center'},
+    	            {header : "物品名称", dataIndex : 'displayName', width : 360, align : 'center'},
     	            {header : "批次", dataIndex : 'batchNumber', width : 160, align : 'center'},
     	            //{header : "出库仓库", dataIndex : 'warehouseName', width : 60, align : 'center'},
-    	            {header : "数量", dataIndex : 'amount', width : 60, align : 'center'}
+    	            {header : "数量(入库单位)", dataIndex : 'amountWithUnit', width : 120, align : 'center'},
+    	            {header : "数量(申领单位)", dataIndex : 'middlePackageUnitAmountWithUnit', width : 120, align : 'center'}
 	    	    ]
 	    }
 };