Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java =================================================================== diff -u -r13039 -r13072 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java (.../GodownEntryItemManagerImpl.java) (revision 13039) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManagerImpl.java (.../GodownEntryItemManagerImpl.java) (revision 13072) @@ -12,6 +12,7 @@ import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.model.OrgUnit; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; +import com.forgon.disinfectsystem.diposablegoods.util.GodownEntryUtil; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; @@ -43,7 +44,7 @@ String endDateTime, String supplier,String orderField,String warehouseId, String type) { String sql = " where " + dateQueryAdapter.dateAreaSql("po.godownEntry.time", startDateTime, endDateTime); - sql += " and po.godownEntry.type = '" + type + "'"; + sql += " and " + GodownEntryUtil.getGodownEntryTypeSqlWhere("po.godownEntry", type); if(StringUtils.isNotBlank(supplier)){ sql += " and po.supplierName = '" + supplier + "'"; }