Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
===================================================================
diff -u -r22117 -r22118
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22117)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java	(.../ExpensiveGoodsGodownEntryManagerImpl.java)	(revision 22118)
@@ -1552,10 +1552,10 @@
 	 */
 	@Override
 	public void godownOutEntryAllPreInInstance(){
-		String sql = String.format(" where po.entryType='%s' and po.useRecord.id is null  ", ExpensiveGoodsInstance.ENTRY_TYPE_PREPARE);
+		String sql = String.format(" where po.entryType='%s' and po.status!='%s' and po.useRecord.id is null  ", ExpensiveGoodsInstance.ENTRY_TYPE_PREPARE,ExpensiveGoodsInstance.STATUS_OUT_WAREHOUSE);
 //		String sql = String.format(" where po.status='%s' ", ExpensiveGoodsInstance.STATUS_PRE_IN_WAREHOUSE);
 		
-		String expensiveGoodsSql = String.format(" where po.id in(select egi.expensiveGoods.id from %s egi where egi.entryType='%s' and egi.useRecord.id is null)  ",ExpensiveGoodsInstance.class.getSimpleName(), ExpensiveGoodsInstance.ENTRY_TYPE_PREPARE);
+		String expensiveGoodsSql = String.format(" where po.id in(select egi.expensiveGoods.id from %s egi where egi.entryType='%s' and egi.status!='%s' and egi.useRecord.id is null)  ",ExpensiveGoodsInstance.class.getSimpleName(), ExpensiveGoodsInstance.ENTRY_TYPE_PREPARE,ExpensiveGoodsInstance.STATUS_OUT_WAREHOUSE);
 		List<ExpensiveGoods> expensiveGoodsList = objectDao.getBySql_ForUpdate2(ExpensiveGoods.class.getSimpleName(), expensiveGoodsSql);
 		
 		List<ExpensiveGoodsInstance> list = objectDao.findBySql(ExpensiveGoodsInstance.class.getSimpleName(), sql);