Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.js
===================================================================
diff -u -r12331 -r14417
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.js	(.../supplierView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.js	(.../supplierView.js)	(revision 14417)
@@ -113,7 +113,7 @@
 			dataIndex : 'cellPhone'
 		}, {
 			header : "厂商类型",
-			width : 80,
+			width : 120,  //列宽加大
 			dataIndex : 'rentTousse'
 		}, {
 			header : "邮件",
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java
===================================================================
diff -u -r14018 -r14417
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java	(.../SupplierManager.java)	(revision 14018)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManager.java	(.../SupplierManager.java)	(revision 14417)
@@ -18,7 +18,7 @@
 	
 	public void deleteSupplierById(String id);
 	
-	public boolean verifySupplier(String id,String name);
+	public boolean verifySupplier(String id,String name, String type);  //多传一个供应商类型（陈家儒改）
 	
 	public List<Supplier> getAllSupplier();
 	
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java
===================================================================
diff -u -r14018 -r14417
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java	(.../SupplierAction.java)	(revision 14018)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/SupplierAction.java	(.../SupplierAction.java)	(revision 14417)
@@ -63,8 +63,9 @@
 	public String validate(){
 		String id = StrutsParamUtils.getPraramValue("validateId",null);
 		String name = StrutsParamUtils.getPraramValue("valifateName",null);
+		String type = StrutsParamUtils.getPraramValue("valifateType",null);  //供应商的类型（陈家儒改）
 		String message = "{success:true,message:'验证成功',stauts:1}";
-		boolean result = supplierManager.verifySupplier(id,name);
+		boolean result = supplierManager.verifySupplier(id,name, type);
 		if(!result){
 			message = "{success:false,message:'已存在相同公司名称',stauts:0}";;
 		}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
===================================================================
diff -u -r14018 -r14417
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 14018)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 14417)
@@ -52,16 +52,31 @@
 		objectDao.delete(getSupplierById(id));
 	}
 
-	public boolean verifySupplier(String id, String companyName) {
-		String sql = "where po.companyName = '" + companyName + "'";
+	public boolean verifySupplier(String id, String companyName, String type) {
+		
+//		String sql = "where po.companyName = '" + companyName + "'";
+//		if (StringUtils.isNotEmpty(id)) {
+//			sql += " and po.id != " + id;
+//		}
+//		Supplier supplier = (Supplier) objectDao.getBySql(Supplier.class.getSimpleName(), sql);
+		
+		String hql = "from " + Supplier.class.getSimpleName() + " where companyName = '" + companyName + "'";
 		if (StringUtils.isNotEmpty(id)) {
-			sql += " and po.id != " + id;
+			hql += " and id != " + id;
 		}
-		if (objectDao.getBySql(Supplier.class.getSimpleName(), sql) != null) {
-			return false;
+		
+		List<Supplier> supplierList = objectDao.findByHql(hql);
+		if (supplierList != null) {  //如果此公司名称已经存在
+			for (Supplier supplier : supplierList) {
+				if (type.equals(supplier.getRentTousse())) {  //只要发现有一个厂商类型相同，则不可以添加
+					return false;
+				}
+			}
+			return true;
 		} else {
 			return true;
 		}
+		
 	}
 
 	@SuppressWarnings("unchecked")
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js
===================================================================
diff -u -r13416 -r14417
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js	(.../supplierForm.js)	(revision 13416)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js	(.../supplierForm.js)	(revision 14417)
@@ -154,7 +154,7 @@
 function validateAndSubmit(){
 	Ext.Ajax.request({
 		url :  WWWROOT + '/disinfectSystem/baseData/supplierAction!validate.do',
-		params : {validateId : top.Ext.getCmp('id').getValue(),valifateName:top.Ext.getCmp('companyName').getValue()},
+		params : {validateId : top.Ext.getCmp('id').getValue(),valifateName:top.Ext.getCmp('companyName').getValue(), valifateType:top.Ext.getCmp('rentTousse').getValue()},  //多传一个供应商类型（陈家儒改）
 		success : function(response, options) {
 			var result = Ext.decode(response.responseText);
 			if(result.stauts==1){