Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
===================================================================
diff -u -r23784 -r23809
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 23784)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java	(.../SupplierManagerImpl.java)	(revision 23809)
@@ -1408,7 +1408,7 @@
 		//1.若是:供应商（1.营业执照 2.经营许可证 3.授权书 4.法人授权委托书 5.质量保证书）
 		if(supplier.getIsSupplier()!=null && supplier.getIsSupplier()){
 			//1-1.授权证（该物品需要授权且该厂商不是页面传的生产厂家 则校验授权证）
-			if((dG.getIsNeedAuthorization() != null && dG.getIsNeedAuthorization()) && supplierId != manufacturerId){
+			if((dG.getIsNeedAuthorization() != null && dG.getIsNeedAuthorization()) && !supplierId.equals(manufacturerId)){
 				//获得该生产厂家下该物品的供应商正在使用的授权证(包括授权记录没关联一次性物品)  
 				String sql = String.format("select count(*) from Certificate po where po.Supplier_Id = %s and po.type='%s' and po.isNowUsing =1 "
 					+ " and po.AuthorizationRecord_Id in (select ar.id from AuthorizationRecord ar where ar.manufacturerId = %s "
@@ -1443,7 +1443,7 @@
 			}
 		}
 		//2.若是:生产厂家且该厂商是页面传的生产厂家（1.营业执照 2.生产许可证 3.注册证）
-		else if(supplier.getIsManufacturer() !=null && supplier.getIsManufacturer() && supplierId == manufacturerId){
+		else if(supplier.getIsManufacturer() !=null && supplier.getIsManufacturer() && supplierId.equals(manufacturerId)){
 			//2-1.注册证
 			//2-1-1获得该生产厂家的一次性物品正在使用的注册证(根据 生产厂家id,一次性物品id )
 			String sql1 = String.format("select count(*) from Certificate po where po.Supplier_Id = %s and po.isNowUsing = 1 and po.type='%s'"
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/uniqueCertificateForm.js
===================================================================
diff -u -r23486 -r23809
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/uniqueCertificateForm.js	(.../uniqueCertificateForm.js)	(revision 23486)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/uniqueCertificateForm.js	(.../uniqueCertificateForm.js)	(revision 23809)
@@ -284,7 +284,7 @@
 		}
 		uniqueCertificateStore.remove(row);
 		var newRow = new certificateRecord({
-			id : isUpdate? 0 : record.data.certificateId,
+			id : isUpdate? 0 : record.data.id,
 			type : top.Ext.getCmp('type').getValue(),
 			certificateNumber : top.Ext.getCmp('certificateNumber').getValue(),
 			productRange : top.Ext.getCmp('productRange').getValue(),
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java
===================================================================
diff -u -r23679 -r23809
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java	(.../ContractManagerImpl.java)	(revision 23679)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/ContractManagerImpl.java	(.../ContractManagerImpl.java)	(revision 23809)
@@ -122,7 +122,11 @@
 		//若有预警时间则需要提示预警
 		if(contract.getWarningTime() != null){
 			contract.setIsNeedWarning(true);
-			contract.setWarningStatus(Contract.CONSTRACT_WRANINGSTATUS_WARNING);
+			if(contract.getWarningTime().before(new Date())){
+				contract.setWarningStatus(Contract.CONSTRACT_WRANINGSTATUS_EXPIRED);
+			}else{
+				contract.setWarningStatus(Contract.CONSTRACT_WRANINGSTATUS_WARNING);
+			}
 		}else{
 			contract.setIsNeedWarning(false);
 			contract.setWarningStatus(Contract.CONSTRACT_WRANINGSTATUS_NORMAL);