Index: ssts-web/src/main/webapp/jasperRtp/monthDiposableGoodsReport.jrxml
===================================================================
diff -u -r12331 -r12679
--- ssts-web/src/main/webapp/jasperRtp/monthDiposableGoodsReport.jrxml	(.../monthDiposableGoodsReport.jrxml)	(revision 12331)
+++ ssts-web/src/main/webapp/jasperRtp/monthDiposableGoodsReport.jrxml	(.../monthDiposableGoodsReport.jrxml)	(revision 12679)
@@ -174,7 +174,7 @@
        sum(case when d.type ='专项物资' then ri.price*ri.amount else 0 end ) as goodsPrice2,
        sum(case when d.type ='低值易耗品' then ri.price*ri.amount else 0 end ) as goodsPrice3,
        sum(case when d.type ='固定资产' then ri.price*ri.amount else 0 end ) as goodsPrice4
-         from ReceiveRecord rr, ReceiveRecordItem ri,DiposableGoodBatchStock s,DiposableGoods d where rr.id = ri.receiverecord_id
+         from ReceiveRecord rr, ReceiveRecordItem ri,DisposableGoodsBatchStock s,DisposableGoodsStock d where rr.id = ri.receiverecord_id
         and s.id = ri.diposablegoodbatchstock_id and d.id = s.diposablegoods_id and ri.type != '材料' $P!{supplyRoomSql}
 )temptable where amount > 0
 union