Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
===================================================================
diff -u -r22075 -r22095
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js	(.../expensiveGoodsGodownEntryForm.js)	(revision 22075)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js	(.../expensiveGoodsGodownEntryForm.js)	(revision 22095)
@@ -675,7 +675,9 @@
 								top.Ext.getCmp('certification1').setValue(record.data.certification);
 								top.Ext.getCmp('manufacturer1').setValue(record.data.madeCompanyName);
 								top.Ext.getCmp('manufacturer1Id').setValue(record.data.madeCompanyId);
-//								top.Ext.getCmp('expDate1').setValue(new Date(record.data.validityTime.time));
+								top.Ext.getCmp('model1').setValue("");
+								top.Ext.getCmp('expDate1').setValue("");
+								top.Ext.getCmp('batchNumber1').setValue("");
 								modelStore.baseParams.expensiveGoodsID = record.data.id;
 								batchNumStore.baseParams.expensiveGoodsID = record.data.id;
 								batchNumStore.load();
@@ -784,7 +786,7 @@
 						valueField : 'model',
 						displayField : 'model',
 						store : modelStore,
-						readOnly : true,
+//						readOnly : true,
 						forceSelection : false,
 						lazyInit : false,
 						triggerAction : 'all',
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
===================================================================
diff -u -r22075 -r22095
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22075)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22095)
@@ -566,9 +566,9 @@
 			// 按型号，高值耗材id查找型号定义
 			expensiveGoodsModel = expensiveGoodsManager.getExpensiveGoodsModelByModel(model, expensiveGoodsId);
 			if(expensiveGoodsModel == null){
-				throw new RuntimeException("未找expensiveGoodsId为:"+expensiveGoodsId+"型号为:"+model+"的型号对象");
+//				throw new RuntimeException("未找expensiveGoodsId为:"+expensiveGoodsId+"型号为:"+model+"的型号对象");
 				//若为空则新建型号定义
-				//expensiveGoodsModel = newexpensiveGoodsModel(expensiveGoods, expensiveGoodsGodownEntryItem,model);
+				expensiveGoodsModel = newexpensiveGoodsModel(expensiveGoods, expensiveGoodsGodownEntryItem,model);
 			}
 		}else{
 			//按高值耗材id查找默认的型号定义