Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java
===================================================================
diff -u -r37719 -r37730
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java	(.../OperationTousseOperationRepartHelper.java)	(revision 37719)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/OperationTousseOperationRepartHelper.java	(.../OperationTousseOperationRepartHelper.java)	(revision 37730)
@@ -880,6 +880,7 @@
 				+ ",(select max(s.wareHouseName) from "
 				+ StorageLocation.class.getSimpleName() 
 				+" s join Storage_TousseInstance st on st.storageLocationId=s.id and st.tousseInstanceId=ti.id ) wareHouseName "
+				+ " ,case when exists (select 1 from StorageRecord s where s.tousseInstanceId=ti.id and s.status='取出') then '有取出记录' else '无取出记录' end storageStatus "
 				+ "from "+ TousseInstance.class.getSimpleName() 
 				+" ti join "
 				+ TousseDefinition.class.getSimpleName() 
@@ -919,6 +920,7 @@
 				+ ",(select max(s.wareHouseName) from "
 				+ StorageLocation.class.getSimpleName() 
 				+" s join Storage_TousseInstance st on st.storageLocationId=s.id and st.tousseInstanceId=ti.id ) wareHouseName "
+				+ " ,case when exists (select 1 from StorageRecord s where s.tousseInstanceId=ti.id and s.status='取出') then '有取出记录' else '无取出记录' end storageStatus "
 				+ "from "+ TousseInstance.class.getSimpleName() 
 				+" ti join "
 				+ TousseDefinition.class.getSimpleName() 
@@ -983,7 +985,18 @@
 				if(enteringDate != null){
 					vo.setUseRecordEnteringDate(df.format(enteringDate));
 				}
-				vo.setWareHouseName(rs.getString("wareHouseName"));
+				String wareHouseName = rs.getString("wareHouseName");
+				if(StringUtils.isNotBlank(wareHouseName)){
+					vo.setWareHouseName(wareHouseName);
+					vo.setStorageStatus("在库");
+				}else{
+					String storageStatus = rs.getString("storageStatus");
+					if("有取出记录".equals(storageStatus)){
+						vo.setStorageStatus("出库");
+					}else{
+						vo.setStorageStatus("");
+					}
+				}
 				vo.setUseRecordOperator(rs.getString("useRecordOperator"));
 				if(StringUtils.isNotBlank(vo.getUseRecordEnteringDate())){
 					vo.setUsed(Constants.STR_YES);