Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java
===================================================================
diff -u -r15230 -r16610
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java	(.../DisposableGoodsStorageRecordManagerImpl.java)	(revision 15230)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStorageRecordManagerImpl.java	(.../DisposableGoodsStorageRecordManagerImpl.java)	(revision 16610)
@@ -17,6 +17,8 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem;
 import com.forgon.disinfectsystem.entity.packing.PackingRecord;
+import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord;
+import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordItem;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord;
 import com.forgon.tools.SqlBuilder;
@@ -124,6 +126,19 @@
 			sb.append(" where dg.id=").append(disposableGoodsId).append(" and ");
 			sb.append(SqlBuilder.build_number_IN_Statement("dgbs.warehouseID", SqlBuilder.IN, warehosueIds));
 			
+			sb.append(" union all ");
+			
+			//供应室领用
+			sb.append(" select dgbs.batchNumber as batchNumber,rr.operator as operator,'' as serialNumber,rr.time as time,'供应室领用' as type,'' as subType,dgbs.warehouseName as warehouseName,");
+			sb.append(" rri.amount,rri.price as price,(rri.amount*rri.price) as totalPrice,dg.name,dg.specification");
+			sb.append(" from " + ReceiveRecordItem.class.getSimpleName() + " rri ");
+			sb.append(" inner join " + ReceiveRecord.class.getSimpleName() + " rr on rr.id = rri.receiveRecord_id");
+			sb.append(" inner join " + DisposableGoods.class.getSimpleName() + " dg on dg.id = rri.disposableGoodsId");
+			sb.append(" inner join " + DisposableGoodsBatchStock.class.getSimpleName() + " dgbs on rri.disposableGoodsBatchStockId=dgbs.id");
+			sb.append(" where dg.id=").append(disposableGoodsId).append(" and ");
+			sb.append(SqlBuilder.build_number_IN_Statement("dgbs.warehouseID", SqlBuilder.IN, warehosueIds));
+//			sb.append(" 1=1 ");
+			
 			sb.append(" ) md ");
 			sb.append(" where ");
 			sb.append(dateQueryAdapter.dateAreaSql("time", startDate, endDate, true, true));