Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r28044 -r28293
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 28044)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 28293)
@@ -5054,11 +5054,16 @@
      */
     private void setValidUntilAndWarningUntil(TousseInstance ti,  Map<String, ExpirationDateInfo> edsMap, SterilizationRecord sr){
     	if(StringUtils.isNotBlank(ti.getPackageType()) && edsMap.containsKey(ti.getPackageType())){
-        	ExpirationDateInfo ed = edsMap.get(ti.getPackageType());
-        	Date validUntil = DateTools.addDate(sr.getEndDate(), ed.getValidDate());
-        	Date warningUntil = DateTools.addDate(sr.getEndDate(), ed.getWarningDate());
-        	ti.setValidUntil(validUntil);
-        	ti.setWarningUntil(warningUntil);
+        	if(ti.getValidUntil() != null){
+        		ExpirationDateInfo ed = edsMap.get(ti.getPackageType());
+        		Date validUntil = DateTools.addDate(sr.getEndDate(), ed.getValidDate());
+        		ti.setValidUntil(validUntil);
+        	}
+        	if(ti.getWarningUntil() != null){
+        		ExpirationDateInfo ed = edsMap.get(ti.getPackageType());
+        		Date warningUntil = DateTools.addDate(sr.getEndDate(), ed.getWarningDate());
+        		ti.setWarningUntil(warningUntil);
+        	}
         }
     }
 /*************************/
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java
===================================================================
diff -u -r26662 -r28293
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 26662)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/service/GoodsStockManagerImpl.java	(.../GoodsStockManagerImpl.java)	(revision 28293)
@@ -548,8 +548,11 @@
 	 * @return 保存到数据库中的库存对象
 	 */
 	private GoodsStock saveTousseStock(Long wareHouseId,TousseDefinition td,int amount){
+		if(td == null || !DatabaseUtil.isPoIdValid(wareHouseId)){
+			return null;
+		}
 		WareHouse wareHouse = (WareHouse)objectDao.getByProperty(WareHouse.class.getSimpleName(), "id", wareHouseId);
-		if(td == null || wareHouse == null){
+		if(wareHouse == null){
 			return null;
 		}
 		GoodsStock gs = new GoodsStock();