Index: ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js
===================================================================
diff -u -r12724 -r12830
--- ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 12724)
+++ ssts-web/src/main/webapp/disinfectsystem/materialmanager/materialEntryView.js	(.../materialEntryView.js)	(revision 12830)
@@ -142,8 +142,8 @@
 	    listeners : {
 			load : function(store,records) {
 				if(records.length > 0 && id == "") {
-					if (top.Ext.getCmp('wareHouse')) {
-						top.Ext.getCmp('wareHouse').setValue(records[0].data.id);
+					if (top.Ext.getCmp('wareHouseName')) {
+						top.Ext.getCmp('wareHouseName').setValue(records[0].data.id);
 					}
 				}
 			}
@@ -178,10 +178,6 @@
 				name : 'wareHouseId',
 				id : 'wareHouseId'
 			},{
-				xtype : 'hidden',
-				name : 'wareHouseName',
-				id : 'wareHouseName'
-			},{
 				id:'serialNum',
 				columnWidth : .33,
 				layout : 'form',
@@ -235,8 +231,8 @@
 				items : [{
 					xtype : 'combo',
 					fieldLabel : '仓库',
-					id : 'wareHouse',
-					name : 'wareHouse',
+					id : 'wareHouseName',
+					name : 'wareHouseName',
 					editable:false,
 					valueField : 'id',
 					displayField : 'name',
@@ -495,8 +491,7 @@
 				}
 				top.Ext.getCmp("items").setValue(Ext.encode(jsonArray));
 				
-				top.Ext.getCmp("wareHouseId").setValue(top.Ext.getCmp("wareHouse").getValue());
-				top.Ext.getCmp("wareHouseName").setValue(top.Ext.getCmp("wareHouse").getRawValue());
+				top.Ext.getCmp("wareHouseId").setValue(top.Ext.getCmp("wareHouseName").getValue());
 				
 				form.form.submit({
 					url : WWWROOT + '/disinfectSystem/MaterialEntryAction!saveMaterialEntryAction.do',
@@ -600,7 +595,7 @@
 		waitMsg : '正在加载数据，请稍候',
 		params : {id : id},
 		success : function(form, action) {
-			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d'));
+			top.Ext.getCmp("time").setValue(Ext.util.Format.date(new Date(action.result.data.time.time), 'Y-m-d H:i'));
 			for(var i = 0 ;i < action.result.data.itemsList.length ;i++){
 				var materialName = action.result.data.itemsList[i].materialDefinition.name;
 				var specification = action.result.data.itemsList[i].materialDefinition.specification;
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java
===================================================================
diff -u -r12765 -r12830
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java	(.../MaterialEntryManagerImpl.java)	(revision 12765)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java	(.../MaterialEntryManagerImpl.java)	(revision 12830)
@@ -5,9 +5,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+
 import org.apache.commons.lang.StringUtils;
+
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
@@ -239,6 +242,9 @@
 		for (Entry<MaterialDefinition, Integer> entry : updateMaterialDefinition.entrySet()) {
 			MaterialDefinition md = entry.getKey();
 			Integer updateAmount = entry.getValue();
+			if(updateAmount == null || updateAmount == 0){
+				continue;
+			}
 			GoodsStock stock = new GoodsStock();
 			stock.setMaterialDefinitionId(md.getId());
 			stock.setGoodsType(GoodsStock.TYPE_MATERIAL);
@@ -254,9 +260,12 @@
 		if(MaterialEntry.TYPE_OUT.equals(materialEntry.getType())){
 			type = GoodsStockManager.MODE_OUTSTOCK;
 		}
-		//材料入筐
-		goodsStockManager.saveOrUpdateGoodsStock(goodsStockList, type);
-		
+		try {
+			//材料入库
+			goodsStockManager.saveOrUpdateGoodsStock(goodsStockList, type);
+		} catch (Exception e) {
+			throw new RuntimeException(e.getMessage());
+		}
 		materialEntry.setItemsList(materialEntryItems);
 		saveOrUpdate(materialEntry);
 	}