Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r13294 -r13369
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13294)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13369)
@@ -214,7 +214,13 @@
 			sql += " and po.subType in ('" + GodownEntry.SUBTYPE_STOCKTAKE_IN + "','" + GodownEntry.SUBTYPE_STOCKTAKE_OUT + "')";
 		}else{
 			sql += " and po.type='" + godownEntryType + "'";
-			sql += " and po.subType in ('" + GodownEntry.SUBTYPE_MANUAL_IN + "','" + GodownEntry.SUBTYPE_MANUAL_OUT + "')";
+			List<String> types = new ArrayList<String>();
+			types.add(GodownEntry.SUBTYPE_MANUAL_IN);
+			types.add(GodownEntry.SUBTYPE_MANUAL_OUT);
+			types.add(GodownEntry.SUBTYPE_IMPORT_IN);
+			
+			sql += String.format(" and %s ", SqlUtils.getStringFieldInCollectionsPredicate("po.subType", types));
+//			sql += " and po.subType in ('" + GodownEntry.SUBTYPE_MANUAL_IN + "','" + GodownEntry.SUBTYPE_MANUAL_OUT + "')";
 		}
 		/*if(!isAppropriation){
 			sql += " and (po.sourceId is null or po.sourceId = 0)";
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r13300 -r13369
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13300)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 13369)
@@ -2199,6 +2199,7 @@
 		
 		godownEntry.setWarehouseID(Long.valueOf(warehouseID));
 		godownEntry.setWarehouseName(warehouseName);
+		godownEntry.setSubType(GodownEntry.SUBTYPE_IMPORT_IN);
 		for (int i = 1; i <= lastRowNum; i++) {
 			HSSFRow row = diposableSheet.getRow(i);
 			int currentRowNum = i + 1;