Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
===================================================================
diff -u -r12331 -r12735
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js	(.../materialDefinitionView.js)	(revision 12735)
@@ -152,11 +152,11 @@
 			header : "五笔码",
 			width : 100,
 			dataIndex : 'wbCode'
-		},{
+		}/*,{
 			header : "库存数量",
 			width : 100,
 			dataIndex : 'storage'
-		},{
+		}*/,{
 			header : "单一器械跟踪",
 			width : 100,
 			dataIndex : 'isTraceble'
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialCheckAction.java
===================================================================
diff -u -r12713 -r12735
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialCheckAction.java	(.../MaterialCheckAction.java)	(revision 12713)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/action/MaterialCheckAction.java	(.../MaterialCheckAction.java)	(revision 12735)
@@ -15,7 +15,6 @@
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
-import com.forgon.component.grid.GridManager;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialCheckManage;
 import com.forgon.tools.StrutsParamUtils;
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
===================================================================
diff -u -r12331 -r12735
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 12735)
@@ -393,10 +393,12 @@
 		method : 'GET',
 		waitMsg : '正在加载数据，请稍候!',
 		success : function(form, action) {
-			if(id==0) {
+			if(id == 0) {
 				foldersJsonStore.load();
 				top.Ext.getCmp('isTraceble').setValue('是');
 				top.Ext.getCmp('isMonthCheck').setValue('否');
+			}else{
+				top.Ext.getCmp('storage').setValue(action.result.storage);
 			}
 		},
 		failure : function(form, action) {
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r12713 -r12735
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 12713)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 12735)
@@ -886,9 +886,13 @@
 				newGoodsStock(originalName, additionalAmount, stockList, wareHouseList.get(0));
 			}
 		}
-		//修改材料库存
-		goodsStockManager.saveOrUpdateGoodsStock(stockList, GoodsStockManager.MODE_OUTSTOCK);
-		
+		try {
+			//修改材料库存
+			goodsStockManager.saveOrUpdateGoodsStock(stockList,
+					GoodsStockManager.MODE_OUTSTOCK);
+		} catch (Exception e) {
+			throw new RuntimeException(e.getMessage());
+		}
 		packingTask.setSupplementTime(new Date());
 		this.saveOrUpdate(packingTask);
 	}
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
===================================================================
diff -u -r12331 -r12735
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 12331)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java	(.../MaterialDefinitionAction.java)	(revision 12735)
@@ -24,10 +24,16 @@
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 
+import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.directory.model.OrgUnit;
+import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
+import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
 import com.forgon.disinfectsystem.tousse.materialinstance.service.MaterialInstanceManager;
@@ -60,7 +66,19 @@
 	private ImageFileManager imageFileManager;
 
 	private SupplyRoomConfigManager supplyRoomConfigManager;
+	
+	private GoodsStockManager goodsStockManager;
+	
+	private WareHouseManager wareHouseManager;
+	
+	public void setWareHouseManager(WareHouseManager wareHouseManager) {
+		this.wareHouseManager = wareHouseManager;
+	}
 
+	public void setGoodsStockManager(GoodsStockManager goodsStockManager) {
+		this.goodsStockManager = goodsStockManager;
+	}
+
 	public void setImageFileManager(ImageFileManager imageFileManager) {
 		this.imageFileManager = imageFileManager;
 	}
@@ -410,6 +428,22 @@
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("success", true);
 		map.put("data", materialDefinition);
+		Integer storage = 0;
+		
+		String orgUnitCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+		OrgUnit orgUnit = new OrgUnit();
+		orgUnit.setOrgUnitCoding(orgUnitCode);
+		WareHouse wareHouse = wareHouseManager.getDefaultWareHouseListByOrgUnit(orgUnit);
+		if(wareHouse != null){
+			GoodsStock stock = new GoodsStock();
+			stock.setWareHouseId(wareHouse.getId());
+			stock.setMaterialDefinitionId(materialDefinition.getId());
+			List<GoodsStock> stockList = goodsStockManager.getGoodsStockList(stock);
+			if(stockList != null && stockList.size() > 0){
+				storage = stockList.get(0).getAmount();
+			}
+		}
+		map.put("storage", storage);
 		JSONObject jsonObject = JSONObject.fromObject(map, config);
 		String jsonStr = jsonObject.toString();
 		try {