Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
===================================================================
diff -u -r15876 -r15888
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 15876)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 15888)
@@ -71,5 +71,7 @@
   //是否显示按照时间查询
   showTimeSearch : true,
   //  是否不校验供应商
-  notValidateSupply : true
+  notValidateSupply : true,
+  //  是否校验生产厂家
+  validateManufacturer : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r15876 -r15888
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 15876)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 15888)
@@ -212,11 +212,16 @@
 		return false;
 	}
 
-	if(!sstsConfig.notValidateSupply && (top.Ext.getCmp('supplier1').getValue() == null || top.Ext.getCmp('supplier1').getValue() == '') ){
+	if(!sstsConfig.notValidateSupply && top.Ext.isEmpty(top.Ext.getCmp('supplier1'))){
 		showResult("请填写供应商!");
 		return false;
 	}
 
+	if(sstsConfig.validateManufacturer && top.Ext.isEmpty(top.Ext.getCmp('manufacturer').getValue())){
+		showResult("请填写生产厂家!");
+		return false;
+	}
+
 	for(var i = 0;i < top.Ext.getCmp('godownEntryItemGrid').getStore().getCount();i++){
 		if(top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.disposableGoodsID == disposableGoodsID && top.Ext.getCmp('godownEntryItemGrid').getStore().getAt(i).data.batchNumber == batchNumber){
 			showResult("该物品已经存在,不能重复添加!");