Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java
===================================================================
diff -u -r18137 -r19113
--- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 18137)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java	(.../InventoryRecordManagerImpl.java)	(revision 19113)
@@ -437,7 +437,7 @@
 		    	List<InventoryItem> items = new ArrayList<InventoryItem>();
 		    	String inventoryDepartCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig() + ",";
 		    	
-				String sql = "select min(m.externalCode),min(m.name),min(m.specification),sum(s.amount),s.price,m.id,min(m.unit),min(m.goodsType) from MaterialDefinition m "
+				String sql = "select min(m.externalCode),min(m.name),min(m.specification),sum(s.amount),s.price,m.id,min(m.unit),min(m.goodsType),min(m.type) from MaterialDefinition m "
 						   + ", GoodsStock s where m.id = s.materialDefinitionId and m.inventoryDepartCoding like '%" + inventoryDepartCoding + "%' and "
 						   + "wareHouseId = " + wareHouseId + " and s.amount > 0 group by m.id,s.price order by min(m.externalCode) asc";
 				ResultSet rs = objectDao.executeSql(sql);
@@ -459,6 +459,7 @@
 	    			item.setWareHouseName(warehouse.getName());
 	    			item.setUnit(rs.getString(7));
 	    			item.setGoodsType(rs.getString(8));
+	    			item.setType(rs.getString(9));
 	    			items.add(item);
 				}
 			    record.setItems(items);
@@ -579,6 +580,7 @@
 			DisposableGoodsStock disposableGoodsStock,
 			DisposableGoodsBatchStock disposableGoodsBatchStock, Double price,DisposableGoods disposableGoods) {
 		InventoryItem item = new InventoryItem();
+		item.setType(disposableGoodsStock.getType());
 		item.setBatchID(disposableGoodsBatchStock.getDisposableGoodsBatchId());
 		item.setBatchNumber(disposableGoodsBatchStock.getBatchNumber());
 		item.setDiposableGoodsID(disposableGoodsBatchStock.getDisposableGoodsId());
@@ -668,6 +670,7 @@
 										specification, batchNumber);
 						if(goodsBatch != null){
 							InventoryItem item = new InventoryItem();
+							item.setType(goodsBatch.getDiposableGoods().getType());
 			    			item.setBatchID(goodsBatch.getDisposableGoodsBatchId());
 			    			item.setBatchNumber(goodsBatch.getBatchNumber());
 			    			item.setDiposableGoodsID(goodsBatch.getDisposableGoodsId());
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
===================================================================
diff -u -r17964 -r19113
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 17964)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 19113)
@@ -58,7 +58,9 @@
 		  	    {name : 'externalCode'},
 		  	    {name : 'goodsType'},
 		  	    {name : 'expensiveGoodsInfo'},
-		  	    {name : 'sequence'}
+		  	    {name : 'sequence'},
+		  	    {name : 'unit'},
+		  	    {name : 'type'}
 		  	]
 		)
 	});
@@ -178,7 +180,8 @@
 			store : itemsStore,
 			cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:40}), selectModel,
 			    {header : "外部编码",dataIndex : 'externalCode',width : 40,menuDisabled : true},
-	        	{header : "名称",dataIndex : 'name',width : 135,menuDisabled : true},
+	        	{header : "名称",dataIndex : 'name',width : 135,sortable:true,menuDisabled : true},
+	        	{header : "物品类型",dataIndex : 'type',width : 60, sortable:true, menuDisabled : true},
 	        	{header : "规格",dataIndex : 'specification',width : 60,menuDisabled : true},
 	        	{header : "批次",width : 50,dataIndex : 'batchNumber',menuDisabled : true},
 	        	{header : "账面数量",dataIndex : 'amount',width : 40,menuDisabled : true,renderer : isChange},
@@ -207,7 +210,8 @@
         				 }
         			 }
         		},
-	        	{header : "单价",dataIndex : 'cost',width : 30,menuDisabled : true},
+        		{header : "单价",dataIndex : 'cost',width : 30,menuDisabled : true},
+        		{header : "单位",dataIndex : 'unit',width : 30,menuDisabled : true},
 	        	{header : "供应商",width : 70,dataIndex : 'supplierName',menuDisabled : true},
 	        	{id : 'expandColumn',header : "顺序号",width : 30,dataIndex : 'sequence',menuDisabled : true,sortable:true}
 	        ]),
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java
===================================================================
diff -u -r18487 -r19113
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java	(.../InventoryItem.java)	(revision 18487)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakemanager/InventoryItem.java	(.../InventoryItem.java)	(revision 19113)
@@ -45,6 +45,10 @@
 	private Double price;//单价
 	
 	private String supplierName;
+	/**
+	 * 一次性物品类型
+	 */
+	private String type;
 	
 	private String batchNumber;//批次
 	
@@ -138,7 +142,14 @@
 	public void setId(Long id) {
 		this.id = id;
 	}
+	
+	public String getType() {
+		return type;
+	}
 
+	public void setType(String type) {
+		this.type = type;
+	}
 	public String getMaterialName() {
 		return materialName;
 	}
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java
===================================================================
diff -u -r17253 -r19113
--- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java	(.../InventoryRecordAction.java)	(revision 17253)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/action/InventoryRecordAction.java	(.../InventoryRecordAction.java)	(revision 19113)
@@ -124,6 +124,8 @@
 					obj.put("externalCode", goods.getExternalCode());
 					obj.put("goodsType", goods.getGoodsType());
 					obj.put("sequence", goods.getSequence());
+					obj.put("unit", goods.getUnit());
+					obj.put("type", goods.getType());
 					if(DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS.equals(goods.getGoodsType())){
 						List<InventoryExpensiveGoodsItem> expensiveGoodsItems = goods.getItems();
 						JSONArray expensiveGoodsArray = new JSONArray();